Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
e01150e5
Commit
e01150e5
authored
Jul 10, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: only build main_interface_win32.cpp for windows
parent
52bab2a6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+4
-1
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+2
-0
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+2
-9
No files found.
modules/gui/qt4/Modules.am
View file @
e01150e5
...
...
@@ -246,7 +246,6 @@ endif
SOURCES_qt4 = qt4.cpp \
menus.cpp \
main_interface.cpp \
main_interface_win32.cpp \
dialogs_provider.cpp \
input_manager.cpp \
actions_manager.cpp \
...
...
@@ -315,6 +314,10 @@ if HAVE_DARWIN
SOURCES_qt4 += util/searchlineedit_mac.mm
endif
if HAVE_WIN32
SOURCES_qt4 += main_interface_win32.cpp
endif
noinst_HEADERS = \
qt4.hpp \
menus.hpp \
...
...
modules/gui/qt4/main_interface.hpp
View file @
e01150e5
...
...
@@ -194,7 +194,9 @@ public slots:
void
setStatusBarVisibility
(
bool
b_visible
);
void
popupMenu
(
const
QPoint
&
);
#ifdef WIN32
void
changeThumbbarButtons
(
int
);
#endif
/* Manage the Video Functions from the vout threads */
void
getVideoSlot
(
WId
*
p_id
,
int
*
pi_x
,
int
*
pi_y
,
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
e01150e5
...
...
@@ -27,9 +27,8 @@
#include "input_manager.hpp"
#include "actions_manager.hpp"
#ifdef WIN32
#include <QBitmap>
#include <vlc_windows_interfaces.h>
#include <QBitmap>
#include <vlc_windows_interfaces.h>
#define WM_APPCOMMAND 0x0319
...
...
@@ -237,12 +236,9 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
}
return
false
;
}
#endif
//moc doesn't know about #ifdef, so we have to build this method for every platform
void
MainInterface
::
changeThumbbarButtons
(
int
i_status
)
{
#ifdef WIN32
// Define an array of three buttons. These buttons provide images through an
// image list and also provide tooltips.
DWORD
dwMask
=
THB_BITMAP
|
THB_FLAGS
;
...
...
@@ -289,7 +285,4 @@ void MainInterface::changeThumbbarButtons( int i_status)
HRESULT
hr
=
p_taskbl
->
vt
->
ThumbBarUpdateButtons
(
p_taskbl
,
this
->
winId
(),
3
,
thbButtons
);
if
(
S_OK
!=
hr
)
msg_Err
(
p_intf
,
"ThumbBarUpdateButtons failed with error %08lx"
,
hr
);
#endif
}
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