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
f6081e57
Commit
f6081e57
authored
Jan 14, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: Kill more warnings.
parent
94c64e32
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
26 additions
and
21 deletions
+26
-21
modules/gui/qt4/components/complete_preferences.cpp
modules/gui/qt4/components/complete_preferences.cpp
+3
-1
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+8
-2
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+1
-0
modules/gui/qt4/components/extended_panels.hpp
modules/gui/qt4/components/extended_panels.hpp
+1
-2
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+3
-0
modules/gui/qt4/components/open_panels.hpp
modules/gui/qt4/components/open_panels.hpp
+0
-3
modules/gui/qt4/dialogs/vlm.cpp
modules/gui/qt4/dialogs/vlm.cpp
+8
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-13
No files found.
modules/gui/qt4/components/complete_preferences.cpp
View file @
f6081e57
...
@@ -201,7 +201,9 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
...
@@ -201,7 +201,9 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
// Main module excluded
// Main module excluded
if
(
module_is_main
(
p_module
)
)
continue
;
if
(
module_is_main
(
p_module
)
)
continue
;
unsigned
i_subcategory
=
0
,
i_category
=
0
,
confsize
;
unsigned
confsize
;
int
i_subcategory
=
0
,
i_category
=
0
;
bool
b_options
=
false
;
bool
b_options
=
false
;
module_config_t
*
const
p_config
=
module_config_get
(
p_module
,
&
confsize
);
module_config_t
*
const
p_config
=
module_config_get
(
p_module
,
&
confsize
);
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
f6081e57
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
SoundWidget
::
SoundWidget
(
QWidget
*
_parent
,
intf_thread_t
*
_p_intf
,
SoundWidget
::
SoundWidget
(
QWidget
*
_parent
,
intf_thread_t
*
_p_intf
,
bool
b_shiny
)
bool
b_shiny
)
:
b_my_volume
(
false
),
QWidget
(
_parent
)
:
QWidget
(
_parent
),
b_my_volume
(
false
)
{
{
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
QHBoxLayout
*
layout
=
new
QHBoxLayout
(
this
);
QHBoxLayout
*
layout
=
new
QHBoxLayout
(
this
);
...
@@ -159,14 +159,20 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
...
@@ -159,14 +159,20 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
bool
VolumeClickHandler
::
eventFilter
(
QObject
*
obj
,
QEvent
*
e
)
bool
VolumeClickHandler
::
eventFilter
(
QObject
*
obj
,
QEvent
*
e
)
{
{
VLC_UNUSED
(
obj
);
if
(
e
->
type
()
==
QEvent
::
MouseButtonPress
)
if
(
e
->
type
()
==
QEvent
::
MouseButtonPress
)
{
{
aout_VolumeMute
(
p_intf
,
NULL
);
aout_VolumeMute
(
p_intf
,
NULL
);
audio_volume_t
i_volume
;
audio_volume_t
i_volume
;
aout_VolumeGet
(
p_intf
,
&
i_volume
);
aout_VolumeGet
(
p_intf
,
&
i_volume
);
// m->updateVolume( i_volume * VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
// m->updateVolume( i_volume * VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
e
->
accept
();
return
true
;
return
true
;
}
}
else
{
e
->
ignore
();
return
false
;
return
false
;
}
}
}
modules/gui/qt4/components/extended_panels.cpp
View file @
f6081e57
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
#include "qt4.hpp"
#include "qt4.hpp"
#include "input_manager.hpp"
#include "input_manager.hpp"
#include "../../audio_filter/equalizer_presets.h"
#include <vlc_aout.h>
#include <vlc_aout.h>
#include <vlc_intf_strings.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h>
#include <vlc_vout.h>
...
...
modules/gui/qt4/components/extended_panels.hpp
View file @
f6081e57
...
@@ -35,11 +35,10 @@
...
@@ -35,11 +35,10 @@
#include "ui/equalizer.h"
#include "ui/equalizer.h"
#include "ui/video_effects.h"
#include "ui/video_effects.h"
#include "ui/v4l2.h"
#include "ui/v4l2.h"
#include "../../audio_filter/equalizer_presets.h"
#include <QTabWidget>
#include <QTabWidget>
#define BANDS
EQZ_BANDS_MAX
#define BANDS
10
#define NUM_SP_CTRL 5
#define NUM_SP_CTRL 5
class
QSignalMapper
;
class
QSignalMapper
;
...
...
modules/gui/qt4/components/open_panels.cpp
View file @
f6081e57
...
@@ -49,6 +49,9 @@
...
@@ -49,6 +49,9 @@
#define I_DEVICE_TOOLTIP N_("Select the device or the VIDEO_TS directory")
#define I_DEVICE_TOOLTIP N_("Select the device or the VIDEO_TS directory")
static
const
char
*
psz_devModule
[]
=
{
"v4l"
,
"v4l2"
,
"pvr"
,
"dvb"
,
"bda"
,
"dshow"
,
"screen"
,
"jack"
};
/**************************************************************************
/**************************************************************************
* Open Files and subtitles *
* Open Files and subtitles *
**************************************************************************/
**************************************************************************/
...
...
modules/gui/qt4/components/open_panels.hpp
View file @
f6081e57
...
@@ -71,9 +71,6 @@ enum
...
@@ -71,9 +71,6 @@ enum
JACK_DEVICE
JACK_DEVICE
};
};
static
const
char
*
psz_devModule
[]
=
{
"v4l"
,
"v4l2"
,
"pvr"
,
"dvb"
,
"bda"
,
"dshow"
,
"screen"
,
"jack"
};
class
QWidget
;
class
QWidget
;
class
QLineEdit
;
class
QLineEdit
;
class
QString
;
class
QString
;
...
...
modules/gui/qt4/dialogs/vlm.cpp
View file @
f6081e57
...
@@ -816,12 +816,20 @@ void VLMWrapper::EditSchedule( const QString name, const QString input,
...
@@ -816,12 +816,20 @@ void VLMWrapper::EditSchedule( const QString name, const QString input,
_schetime
.
toString
(
"hh:mm:ss"
)
+
"
\"
"
;
_schetime
.
toString
(
"hh:mm:ss"
)
+
"
\"
"
;
vlm_ExecuteCommand
(
p_vlm
,
qtu
(
command
),
&
message
);
vlm_ExecuteCommand
(
p_vlm
,
qtu
(
command
),
&
message
);
vlm_MessageDelete
(
message
);
vlm_MessageDelete
(
message
);
if
(
_scherepeatnumber
>
0
)
if
(
_scherepeatnumber
>
0
)
{
{
command
=
"setup
\"
"
+
name
+
"
\"
repeat
\"
"
+
_scherepeatnumber
+
"
\"
"
;
command
=
"setup
\"
"
+
name
+
"
\"
repeat
\"
"
+
_scherepeatnumber
+
"
\"
"
;
vlm_ExecuteCommand
(
p_vlm
,
qtu
(
command
),
&
message
);
vlm_ExecuteCommand
(
p_vlm
,
qtu
(
command
),
&
message
);
vlm_MessageDelete
(
message
);
vlm_MessageDelete
(
message
);
}
}
if
(
_repeatDays
>
0
)
{
command
=
"setup
\"
"
+
name
+
"
\"
period
\"
"
+
_repeatDays
+
"
\"
"
;
vlm_ExecuteCommand
(
p_vlm
,
qtu
(
command
),
&
message
);
vlm_MessageDelete
(
message
);
}
}
}
...
...
modules/gui/qt4/main_interface.cpp
View file @
f6081e57
...
@@ -640,6 +640,7 @@ void MainInterface::releaseVideoSlot( void )
...
@@ -640,6 +640,7 @@ void MainInterface::releaseVideoSlot( void )
/* Call from WindowControl function */
/* Call from WindowControl function */
int
MainInterface
::
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
)
int
MainInterface
::
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
)
{
{
VLC_UNUSED
(
p_window
);
//FIXME remove this param
int
i_ret
=
VLC_SUCCESS
;
int
i_ret
=
VLC_SUCCESS
;
switch
(
i_query
)
switch
(
i_query
)
{
{
...
...
modules/gui/qt4/qt4.cpp
View file @
f6081e57
...
@@ -471,23 +471,11 @@ static void *Thread( void *obj )
...
@@ -471,23 +471,11 @@ static void *Thread( void *obj )
static
void
ShowDialog
(
intf_thread_t
*
p_intf
,
int
i_dialog_event
,
int
i_arg
,
static
void
ShowDialog
(
intf_thread_t
*
p_intf
,
int
i_dialog_event
,
int
i_arg
,
intf_dialog_args_t
*
p_arg
)
intf_dialog_args_t
*
p_arg
)
{
{
VLC_UNUSED
(
p_intf
);
DialogEvent
*
event
=
new
DialogEvent
(
i_dialog_event
,
i_arg
,
p_arg
);
DialogEvent
*
event
=
new
DialogEvent
(
i_dialog_event
,
i_arg
,
p_arg
);
QApplication
::
postEvent
(
THEDP
,
static_cast
<
QEvent
*>
(
event
)
);
QApplication
::
postEvent
(
THEDP
,
static_cast
<
QEvent
*>
(
event
)
);
}
}
/*****************************************************************************
* PopupMenuCB: callback to show the popupmenu.
* We don't show the menu directly here because we don't want the
* caller to block for a too long time.
*****************************************************************************/
static
int
PopupMenuCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
ShowDialog
(
p_intf
,
INTF_DIALOG_POPUPMENU
,
new_val
.
b_bool
,
0
);
return
VLC_SUCCESS
;
}
/**
/**
* Video output window provider
* Video output window provider
*/
*/
...
...
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