Re-enabled podcasts on Win32

- Linked necessary Windows SDK libraries
- Solved compilation errors upon including `wmsdk.h` or other Windows
SDK headers (`interface` keyword wasn't recognized)
preferencesAboutTextFull
Craig Watson 9 years ago
parent 125d8a4f84
commit 665945f590
  1. 13
      OpenBoard.pro
  2. 6
      src/podcast/UBPodcastController.cpp
  3. 14
      src/podcast/podcast.pri
  4. 5
      src/podcast/windowsmedia/UBWindowsMediaFile.h
  5. 1
      src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp

@ -109,12 +109,20 @@ RCC_DIR = $$BUILD_DIR/rcc
UI_DIR = $$BUILD_DIR/ui UI_DIR = $$BUILD_DIR/ui
win32 { win32 {
LIBS += -lUser32
LIBS += -lGdi32
LIBS += -lAdvApi32
LIBS += -lOle32
RC_FILE = resources/win/OpenBoard.rc RC_FILE = resources/win/OpenBoard.rc
CONFIG += qaxcontainer CONFIG += axcontainer
exists(console):CONFIG += console exists(console):CONFIG += console
QMAKE_CXXFLAGS += /MP QMAKE_CXXFLAGS += /MP
QMAKE_CXXFLAGS += /MD
QMAKE_CXXFLAGS_RELEASE += /Od /Zi QMAKE_CXXFLAGS_RELEASE += /Od /Zi
QMAKE_LFLAGS_RELEASE += /DEBUG QMAKE_LFLAGS += /VERBOSE:LIB
UB_LIBRARY.path = $$DESTDIR UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR UB_ETC.path = $$DESTDIR
@ -126,6 +134,7 @@ win32 {
DEFINES += NOMINMAX # avoids compilation error in qdatetime.h DEFINES += NOMINMAX # avoids compilation error in qdatetime.h
} }
macx { macx {

@ -57,8 +57,8 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// #include "windowsmedia/UBWindowsMediaVideoEncoder.h" #include "windowsmedia/UBWindowsMediaVideoEncoder.h"
// #include "windowsmedia/UBWaveRecorder.h" #include "windowsmedia/UBWaveRecorder.h"
#elif defined(Q_OS_OSX) #elif defined(Q_OS_OSX)
#include "quicktime/UBQuickTimeVideoEncoder.h" #include "quicktime/UBQuickTimeVideoEncoder.h"
#include "quicktime/UBAudioQueueRecorder.h" #include "quicktime/UBAudioQueueRecorder.h"
@ -304,7 +304,7 @@ void UBPodcastController::start()
applicationMainModeChanged(UBApplication::applicationController->displayMode()); applicationMainModeChanged(UBApplication::applicationController->displayMode());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
//mVideoEncoder = new UBWindowsMediaVideoEncoder(this); //deleted on stop mVideoEncoder = new UBWindowsMediaVideoEncoder(this); //deleted on stop
#elif defined(Q_OS_OSX) #elif defined(Q_OS_OSX)
mVideoEncoder = new UBQuickTimeVideoEncoder(this); //deleted on stop mVideoEncoder = new UBQuickTimeVideoEncoder(this); //deleted on stop
#endif #endif

@ -13,13 +13,13 @@ SOURCES += src/podcast/UBPodcastController.cpp \
win32 { win32 {
# SOURCES += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp \ SOURCES += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp \
# src/podcast/windowsmedia/UBWindowsMediaFile.cpp \ src/podcast/windowsmedia/UBWindowsMediaFile.cpp \
# src/podcast/windowsmedia/UBWaveRecorder.cpp src/podcast/windowsmedia/UBWaveRecorder.cpp
#
# HEADERS += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h \ HEADERS += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h \
# src/podcast/windowsmedia/UBWindowsMediaFile.h \ src/podcast/windowsmedia/UBWindowsMediaFile.h \
# src/podcast/windowsmedia/UBWaveRecorder.h src/podcast/windowsmedia/UBWaveRecorder.h
} }
macx { macx {

@ -30,8 +30,9 @@
#include <QtCore> #include <QtCore>
#include <wmsbuffer.h> #ifndef inteface
#define interface struct
#endif
#include <wmsdk.h> #include <wmsdk.h>
class UBWindowsMediaFile : public QObject class UBWindowsMediaFile : public QObject

@ -33,7 +33,6 @@
#include "core/UBApplication.h" #include "core/UBApplication.h"
#include "UBWindowsMediaFile.h"
#include "core/memcheck.h" #include "core/memcheck.h"

Loading…
Cancel
Save