Qt4 - add ifdef if someone compiles vlc without vlm support

diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
index 571cfa132f99a6b289009e73ff3d9f30011b41cc..6aa2aa575c19febeb4f2a8d8b4dd6ca760c9ca4b 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.cpp
+++ b/modules/gui/qt4/dialogs/vlm.cpp
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef ENABLE_VLM
+
 #include "dialogs/vlm.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs/sout.hpp"
@@ -624,3 +626,5 @@ void VLMWrapper::EditVod( const QString name, const QString input,
         vlm_MessageDelete( message );
     }
 }
+
+#endif

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index f0ff4bfa4af75564f77a312d3dc26b218beab404..4aed2f9783c39587693fb38c15357e08298fbb77 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -25,6 +25,8 @@
 #ifndef _VLM_DIALOG_H_
 #define _VLM_DIALOG_H_
 
+#ifdef ENABLE_VLM
+
 #include <vlc/vlc.h>
 #include <vlc_vlm.h>
 
@@ -197,4 +199,5 @@ private:
 
 };
 
+#endif /* ENABLE_VLM*/
 #endif

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 0419d8e2ea5bc90241d012e1a5a809a53a7183f1..59a7fab3c866654e3b8cd43775bf9d172b8fd0b0 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -43,13 +43,11 @@
 #include "dialogs/extended.hpp"
 #include "dialogs/sout.hpp"
 #include "dialogs/open.hpp"
-#include "dialogs/vlm.hpp"
 #include "dialogs/help.hpp"
 #include "dialogs/gototime.hpp"
 #include "dialogs/podcast_configuration.hpp"
 #include "dialogs/vlm.hpp"
 
-
 DialogsProvider* DialogsProvider::instance = NULL;
 
 DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
@@ -114,8 +112,10 @@ void DialogsProvider::customEvent( QEvent *event )
            bookmarksDialog(); break;
         case INTF_DIALOG_EXTENDED:
            extendedDialog(); break;
+#ifdef ENABLE_VLM
         case INTF_DIALOG_VLM:
            vlmDialog(); break;
+#endif
         case INTF_DIALOG_INTERACTION:
            doInteraction( de->p_arg ); break;
         case INTF_DIALOG_POPUPMENU:
@@ -169,10 +169,12 @@ void DialogsProvider::gotoTimeDialog()
     GotoTimeDialog::getInstance( p_intf )->toggleVisible();
 }
 
+#ifdef ENABLE_VLM
 void DialogsProvider::vlmDialog()
 {
     VLMDialog::getInstance( p_intf )->toggleVisible();
 }
+#endif
 
 void DialogsProvider::helpDialog()
 {

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 15ab94bdbfcb3ddc6acd92d60652a3d7d36b5c09..3a6b86fb6c9638077925d77cebde9c83616bc37a 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -147,7 +147,9 @@ public slots:
     void prefsDialog();
     void extendedDialog();
     void messagesDialog();
+#ifdef ENABLE_VLM
     void vlmDialog();
+#endif
     void helpDialog();
 #ifdef UPDATE_CHECK
     void updateDialog();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index cc1ec0233d5ba92f3b9a0899e2d94180cec8c21f..36ad12a208c1d53a45c7c3968207fe4f03272842 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -301,8 +301,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
 
     addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","", 
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
+#ifdef ENABLE_VLM
     addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
         "Ctrl+V" );
+#endif
 
     menu->addSeparator();
     addDPStaticEntry( menu, qtr( "Preferences..." ), "",