Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
4a48618f
Commit
4a48618f
authored
Jan 12, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - add ifdef if someone compiles vlc without vlm support
parent
5718c840
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
2 deletions
+15
-2
modules/gui/qt4/dialogs/vlm.cpp
modules/gui/qt4/dialogs/vlm.cpp
+4
-0
modules/gui/qt4/dialogs/vlm.hpp
modules/gui/qt4/dialogs/vlm.hpp
+3
-0
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+4
-2
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+2
-0
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+2
-0
No files found.
modules/gui/qt4/dialogs/vlm.cpp
View file @
4a48618f
...
...
@@ -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
modules/gui/qt4/dialogs/vlm.hpp
View file @
4a48618f
...
...
@@ -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
modules/gui/qt4/dialogs_provider.cpp
View file @
4a48618f
...
...
@@ -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
()
{
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
4a48618f
...
...
@@ -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
();
...
...
modules/gui/qt4/menus.cpp
View file @
4a48618f
...
...
@@ -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..."
),
""
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment