From 7cd163e9e6ce93d69297cfb6fb0606677280b48e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Thu, 23 Oct 2008 18:27:27 +0000 Subject: [PATCH] Add cmake option -DNO_JOGSHUTTLE=1 to disable compilation of jogshuttle stuff, patch by Alberto Villa svn path=/branches/KDE4/; revision=2547 --- src/CMakeLists.txt | 7 ++++++- src/kdenlivesettingsdialog.cpp | 10 ++++++++++ src/kdenlivesettingsdialog.h | 2 ++ src/mainwindow.cpp | 14 +++++++++++++- src/mainwindow.h | 8 ++++++++ src/widgets/configjogshuttle_ui.ui | 9 ++++++++- 6 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22ed37b6..98a7fc47 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -109,7 +109,6 @@ set(kdenlive_SRCS abstractclipitem.cpp transitionsettings.cpp recmonitor.cpp - jogshuttle.cpp addtransitioncommand.cpp edittransitioncommand.cpp addfoldercommand.cpp @@ -134,6 +133,12 @@ set(kdenlive_SRCS editclipcommand.cpp ) +if(NO_JOGSHUTTLE) + add_definitions(-DNO_JOGSHUTTLE) +else(NO_JOGSHUTTLE) + set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS}) +endif(NO_JOGSHUTTLE) + kde4_add_kcfg_files(kdenlive_SRCS GENERATE_MOC kdenlivesettings.kcfgc ) kde4_add_executable(kdenlive ${kdenlive_SRCS} ${kdenlive_UI}) diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 29977181..73b07d20 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -28,7 +28,9 @@ #include #include #include +#ifndef NO_JOGSHUTTLE #include +#endif /* NO_JOGSHUTTLE */ #include "profilesdialog.h" #include "kdenlivesettings.h" @@ -62,9 +64,15 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog( QWidget *p5 = new QWidget; m_configShuttle.setupUi(p5); +#ifndef NO_JOGSHUTTLE connect(m_configShuttle.kcfg_enableshuttle, SIGNAL(stateChanged(int)), this, SLOT(slotCheckShuttle(int))); connect(m_configShuttle.shuttledevicelist, SIGNAL(activated(int)), this, SLOT(slotUpdateShuttleDevice(int))); slotCheckShuttle(KdenliveSettings::enableshuttle()); + m_configShuttle.shuttledisabled->hide(); +#else + m_configShuttle.kcfg_enableshuttle->hide(); + m_configShuttle.kcfg_enableshuttle->setDisabled(true); +#endif /* NO_JOGSHUTTLE */ page5 = addPage(p5, i18n("JogShuttle"), "input-mouse"); QWidget *p6 = new QWidget; @@ -241,6 +249,7 @@ void KdenliveSettingsDialog::slotEditImageApplication() { m_configEnv.kcfg_defaultimageapp->setText(service->exec()); } +#ifndef NO_JOGSHUTTLE void KdenliveSettingsDialog::slotCheckShuttle(int state) { m_configShuttle.config_group->setEnabled(state); if (m_configShuttle.shuttledevicelist->count() == 0) { @@ -267,6 +276,7 @@ void KdenliveSettingsDialog::slotUpdateShuttleDevice(int ix) { //KdenliveSettings::setShuttledevice(device); m_configShuttle.kcfg_shuttledevice->setText(device); } +#endif /* NO_JOGSHUTTLE */ void KdenliveSettingsDialog::rebuildVideo4Commands() { QString captureCommand; diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h index 7fad4d6e..fa513b72 100644 --- a/src/kdenlivesettingsdialog.h +++ b/src/kdenlivesettingsdialog.h @@ -48,8 +48,10 @@ public: private slots: void slotUpdateDisplay(); void rebuildVideo4Commands(); +#ifndef NO_JOGSHUTTLE void slotCheckShuttle(int state = 0); void slotUpdateShuttleDevice(int ix = 0); +#endif /* NO_JOGSHUTTLE */ void slotEditImageApplication(); void slotEditAudioApplication(); void slotEditVideoApplication(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b684b949..e7d04b83 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -74,7 +74,9 @@ #include "transitionsettings.h" #include "renderwidget.h" #include "renderer.h" +#ifndef NO_JOGSHUTTLE #include "jogshuttle.h" +#endif /* NO_JOGSHUTTLE */ #include "clipproperties.h" #include "wizard.h" #include "editclipcommand.h" @@ -98,7 +100,11 @@ EffectsList MainWindow::transitions; MainWindow::MainWindow(const QString &MltPath, QWidget *parent) : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) { + m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), +#ifndef NO_JOGSHUTTLE + m_jogProcess(NULL), +#endif /* NO_JOGSHUTTLE */ + m_findActivated(false), m_initialized(false) { setlocale(LC_NUMERIC, "POSIX"); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -329,7 +335,9 @@ MainWindow::MainWindow(const QString &MltPath, QWidget *parent) newFile(false); } +#ifndef NO_JOGSHUTTLE activateShuttleDevice(); +#endif /* NO_JOGSHUTTLE */ projectListDock->raise(); } @@ -385,6 +393,7 @@ void MainWindow::slotReloadEffects() { m_effectList->reloadEffectList(); } +#ifndef NO_JOGSHUTTLE void MainWindow::activateShuttleDevice() { if (m_jogProcess) delete m_jogProcess; m_jogProcess = NULL; @@ -430,6 +439,7 @@ void MainWindow::slotShuttleAction(int code) { break; } } +#endif /* NO_JOGSHUTTLE */ void MainWindow::configureNotifications() { KNotifyConfigWidget::configure(this); @@ -1355,7 +1365,9 @@ void MainWindow::updateConfiguration() { } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); +#ifndef NO_JOGSHUTTLE activateShuttleDevice(); +#endif /* NO_JOGSHUTTLE */ } diff --git a/src/mainwindow.h b/src/mainwindow.h index ed672aaa..477c1556 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -53,7 +53,9 @@ class Monitor; class RecMonitor; class CustomTrackView; class RenderWidget; +#ifndef NO_JOGSHUTTLE class JogShuttle; +#endif /* NO_JOGSHUTTLE */ class DocClipBase; class Render; @@ -132,7 +134,9 @@ private: RenderWidget *m_renderWidget; +#ifndef NO_JOGSHUTTLE JogShuttle *m_jogProcess; +#endif /* NO_JOGSHUTTLE */ KRecentFilesAction *m_fileOpenRecent; KAction *m_projectSearch; @@ -158,8 +162,10 @@ private: void readOptions(); void saveOptions(); +#ifndef NO_JOGSHUTTLE void activateShuttleDevice(); void slotShuttleAction(int code); +#endif /* NO_JOGSHUTTLE */ void connectDocumentInfo(KdenliveDoc *doc); void findAhead(); void doOpenFile(const KUrl &url, KAutoSaveFile *stale); @@ -212,7 +218,9 @@ private slots: void slotAddCustomEffect(QAction *result); void slotAddTransition(QAction *result); void slotAddProjectClip(KUrl url); +#ifndef NO_JOGSHUTTLE void slotShuttleButton(int code); +#endif /* NO_JOGSHUTTLE */ void slotShowClipProperties(DocClipBase *clip); void slotActivateEffectStackView(); void slotActivateTransitionView(); diff --git a/src/widgets/configjogshuttle_ui.ui b/src/widgets/configjogshuttle_ui.ui index 9abb022f..d3f6c111 100644 --- a/src/widgets/configjogshuttle_ui.ui +++ b/src/widgets/configjogshuttle_ui.ui @@ -18,6 +18,13 @@ + + + Jog Shuttle device disabled. + + + + false @@ -96,7 +103,7 @@ - + Qt::Vertical -- 2.39.2