Qt4 - add ifdef if someone compiles vlc without vlm support
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 12 Jan 2008 20:00:02 +0000 (20:00 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 12 Jan 2008 20:00:02 +0000 (20:00 +0000)
modules/gui/qt4/dialogs/vlm.cpp
modules/gui/qt4/dialogs/vlm.hpp
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/menus.cpp

index 571cfa1..6aa2aa5 100644 (file)
@@ -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
index f0ff4bf..4aed2f9 100644 (file)
@@ -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
index 0419d8e..59a7fab 100644 (file)
 #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()
 {
index 15ab94b..3a6b86f 100644 (file)
@@ -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();
index cc1ec02..36ad12a 100644 (file)
@@ -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..." ), "",