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 @@
* 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
......@@ -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
......@@ -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()
{
......
......@@ -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();
......
......@@ -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..." ), "",
......
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