Commit 4a48618f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - add ifdef if someone compiles vlc without vlm support

parent 5718c840
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef ENABLE_VLM
#include "dialogs/vlm.hpp" #include "dialogs/vlm.hpp"
#include "dialogs/open.hpp" #include "dialogs/open.hpp"
#include "dialogs/sout.hpp" #include "dialogs/sout.hpp"
...@@ -624,3 +626,5 @@ void VLMWrapper::EditVod( const QString name, const QString input, ...@@ -624,3 +626,5 @@ void VLMWrapper::EditVod( const QString name, const QString input,
vlm_MessageDelete( message ); vlm_MessageDelete( message );
} }
} }
#endif
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef _VLM_DIALOG_H_ #ifndef _VLM_DIALOG_H_
#define _VLM_DIALOG_H_ #define _VLM_DIALOG_H_
#ifdef ENABLE_VLM
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_vlm.h> #include <vlc_vlm.h>
...@@ -197,4 +199,5 @@ private: ...@@ -197,4 +199,5 @@ private:
}; };
#endif /* ENABLE_VLM*/
#endif #endif
...@@ -43,13 +43,11 @@ ...@@ -43,13 +43,11 @@
#include "dialogs/extended.hpp" #include "dialogs/extended.hpp"
#include "dialogs/sout.hpp" #include "dialogs/sout.hpp"
#include "dialogs/open.hpp" #include "dialogs/open.hpp"
#include "dialogs/vlm.hpp"
#include "dialogs/help.hpp" #include "dialogs/help.hpp"
#include "dialogs/gototime.hpp" #include "dialogs/gototime.hpp"
#include "dialogs/podcast_configuration.hpp" #include "dialogs/podcast_configuration.hpp"
#include "dialogs/vlm.hpp" #include "dialogs/vlm.hpp"
DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider* DialogsProvider::instance = NULL;
DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
...@@ -114,8 +112,10 @@ void DialogsProvider::customEvent( QEvent *event ) ...@@ -114,8 +112,10 @@ void DialogsProvider::customEvent( QEvent *event )
bookmarksDialog(); break; bookmarksDialog(); break;
case INTF_DIALOG_EXTENDED: case INTF_DIALOG_EXTENDED:
extendedDialog(); break; extendedDialog(); break;
#ifdef ENABLE_VLM
case INTF_DIALOG_VLM: case INTF_DIALOG_VLM:
vlmDialog(); break; vlmDialog(); break;
#endif
case INTF_DIALOG_INTERACTION: case INTF_DIALOG_INTERACTION:
doInteraction( de->p_arg ); break; doInteraction( de->p_arg ); break;
case INTF_DIALOG_POPUPMENU: case INTF_DIALOG_POPUPMENU:
...@@ -169,10 +169,12 @@ void DialogsProvider::gotoTimeDialog() ...@@ -169,10 +169,12 @@ void DialogsProvider::gotoTimeDialog()
GotoTimeDialog::getInstance( p_intf )->toggleVisible(); GotoTimeDialog::getInstance( p_intf )->toggleVisible();
} }
#ifdef ENABLE_VLM
void DialogsProvider::vlmDialog() void DialogsProvider::vlmDialog()
{ {
VLMDialog::getInstance( p_intf )->toggleVisible(); VLMDialog::getInstance( p_intf )->toggleVisible();
} }
#endif
void DialogsProvider::helpDialog() void DialogsProvider::helpDialog()
{ {
......
...@@ -147,7 +147,9 @@ public slots: ...@@ -147,7 +147,9 @@ public slots:
void prefsDialog(); void prefsDialog();
void extendedDialog(); void extendedDialog();
void messagesDialog(); void messagesDialog();
#ifdef ENABLE_VLM
void vlmDialog(); void vlmDialog();
#endif
void helpDialog(); void helpDialog();
#ifdef UPDATE_CHECK #ifdef UPDATE_CHECK
void updateDialog(); void updateDialog();
......
...@@ -301,8 +301,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -301,8 +301,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","", addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
SLOT( bookmarksDialog() ), "Ctrl+B" ); SLOT( bookmarksDialog() ), "Ctrl+B" );
#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ), addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
"Ctrl+V" ); "Ctrl+V" );
#endif
menu->addSeparator(); menu->addSeparator();
addDPStaticEntry( menu, qtr( "Preferences..." ), "", addDPStaticEntry( menu, qtr( "Preferences..." ), "",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment