Fix build on Mac OS X.

svn path=/trunk/kdenlive/; revision=5162

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31a9238c02bacb7cc0b37a449f810bc7ad57cb9c..74dca0df158f689e03dc5057113f0fef38bf223c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -257,8 +257,6 @@ set(kdenlive_SRCS
   kiss_fft/_kiss_fft_guts.h
   kiss_fft/kiss_fft.c
   kiss_fft/tools/kiss_fftr.c
-  jogaction.cpp
-  jogshuttleconfig.cpp
 )
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/src/colorcorrection)
@@ -269,7 +267,7 @@ add_definitions(${KDE4_DEFINITIONS})
 if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
   add_definitions(-DNO_JOGSHUTTLE)
 else(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
-  set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS})
+  set(kdenlive_SRCS jogshuttle.cpp jogaction.cpp jogshuttleconfig.cpp ${kdenlive_SRCS})
 endif(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
 
 if(APPLE OR OPENGL_FOUND)

diff --git a/src/colorcorrection/vectorscopegenerator.h b/src/colorcorrection/vectorscopegenerator.h
index 15744e1a9b1185824643e4dfb123230ac353613e..3aa3669e330570c6fe8551113bbb69c7f055ed58 100644 (file)
--- a/src/colorcorrection/vectorscopegenerator.h
+++ b/src/colorcorrection/vectorscopegenerator.h
@@ -12,6 +12,7 @@
 #define VECTORSCOPEGENERATOR_H
 
 #include <QObject>
+#include <QtGui/QImage>
 
 class QImage;
 class QPoint;

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 1582c3c43312e97ae1678aeb085a7f2266e881d1..d2ba47fad5ffa08453891c2f14c92be4fee7f1b1 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -493,6 +493,7 @@ void KdenliveSettingsDialog::updateWidgets()
 {
     // Revert widgets to last saved state (for example when user pressed "Cancel")
     // kDebug() << "// // // KCONFIG Revert called";
+#ifndef NO_JOGSHUTTLE
     // revert jog shuttle device
     if (m_configShuttle.shuttledevicelist->count() > 0) {
        for (int i = 0; i < m_configShuttle.shuttledevicelist->count(); i++) {
@@ -523,6 +524,7 @@ void KdenliveSettingsDialog::updateWidgets()
       if (i < actions_map.size())
         button->setCurrentIndex(action_pos[actions_map[i]]);
     }
+#endif
 }
 
 void KdenliveSettingsDialog::updateSettings()
@@ -619,6 +621,7 @@ void KdenliveSettingsDialog::updateSettings()
         saveTranscodeProfiles();
     }
 
+#ifndef NO_JOGSHUTTLE
     m_shuttleModified = false;
 
     QStringList actions;
@@ -630,6 +633,7 @@ void KdenliveSettingsDialog::updateSettings()
     //fprintf(stderr, "Shuttle config: %s\n", JogShuttleConfig::actionMap(actions).toAscii().constData());
     if (KdenliveSettings::shuttlebuttons() != maps)
        KdenliveSettings::setShuttlebuttons(maps);
+#endif
 
 #if KDE_IS_VERSION(4,3,0)
     KConfigDialog::settingsChangedSlot();
@@ -711,6 +715,7 @@ void KdenliveSettingsDialog::slotDeleteTranscode()
 
 void KdenliveSettingsDialog::slotShuttleModified()
 {
+#ifndef NO_JOGSHUTTLE
     QStringList actions;
     actions << "monitor_pause";  // the Job rest position action.
     foreach (KComboBox* button, m_shuttle_buttons) {
@@ -718,6 +723,7 @@ void KdenliveSettingsDialog::slotShuttleModified()
     }
     QString maps = JogShuttleConfig::actionMap(actions);
     m_shuttleModified = KdenliveSettings::shuttlebuttons() != maps;
+#endif
 #if KDE_IS_VERSION(4,3,0)
     KConfigDialog::updateButtons();
 #endif