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
1463e7cb
Commit
1463e7cb
authored
Feb 10, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FSC memory leaks
parent
5c3476e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
25 deletions
+33
-25
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+23
-23
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+1
-1
modules/gui/qt4/components/controller_widget.hpp
modules/gui/qt4/components/controller_widget.hpp
+8
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
No files found.
modules/gui/qt4/components/controller.cpp
View file @
1463e7cb
...
...
@@ -190,7 +190,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
switch
(
button
)
{
case
PLAY_BUTTON
:
{
PlayButton
*
playButton
=
new
PlayButton
;
PlayButton
*
playButton
=
new
PlayButton
(
this
)
;
setupButton
(
playButton
);
BUTTON_SET_BAR
(
playButton
);
CONNECT_MAP_SET
(
playButton
,
PLAY_ACTION
);
...
...
@@ -200,7 +200,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
STOP_BUTTON
:{
QToolButton
*
stopButton
=
new
QToolButton
;
QToolButton
*
stopButton
=
new
QToolButton
(
this
)
;
setupButton
(
stopButton
);
CONNECT_MAP_SET
(
stopButton
,
STOP_ACTION
);
BUTTON_SET_BAR
(
stopButton
);
...
...
@@ -208,7 +208,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
OPEN_BUTTON
:{
QToolButton
*
openButton
=
new
QToolButton
;
QToolButton
*
openButton
=
new
QToolButton
(
this
)
;
setupButton
(
openButton
);
CONNECT_MAP_SET
(
openButton
,
OPEN_ACTION
);
BUTTON_SET_BAR
(
openButton
);
...
...
@@ -216,7 +216,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
PREVIOUS_BUTTON
:{
QToolButton
*
prevButton
=
new
QToolButton
;
QToolButton
*
prevButton
=
new
QToolButton
(
this
)
;
setupButton
(
prevButton
);
CONNECT_MAP_SET
(
prevButton
,
PREVIOUS_ACTION
);
BUTTON_SET_BAR
(
prevButton
);
...
...
@@ -225,7 +225,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
break
;
case
NEXT_BUTTON
:
{
QToolButton
*
nextButton
=
new
QToolButton
;
QToolButton
*
nextButton
=
new
QToolButton
(
this
)
;
setupButton
(
nextButton
);
CONNECT_MAP_SET
(
nextButton
,
NEXT_ACTION
);
BUTTON_SET_BAR
(
nextButton
);
...
...
@@ -233,7 +233,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
SLOWER_BUTTON
:{
QToolButton
*
slowerButton
=
new
QToolButton
;
QToolButton
*
slowerButton
=
new
QToolButton
(
this
)
;
setupButton
(
slowerButton
);
CONNECT_MAP_SET
(
slowerButton
,
SLOWER_ACTION
);
BUTTON_SET_BAR
(
slowerButton
);
...
...
@@ -242,7 +242,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
FASTER_BUTTON
:{
QToolButton
*
fasterButton
=
new
QToolButton
;
QToolButton
*
fasterButton
=
new
QToolButton
(
this
)
;
setupButton
(
fasterButton
);
CONNECT_MAP_SET
(
fasterButton
,
FASTER_ACTION
);
BUTTON_SET_BAR
(
fasterButton
);
...
...
@@ -251,7 +251,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
FRAME_BUTTON
:
{
QToolButton
*
frameButton
=
new
QToolButton
;
QToolButton
*
frameButton
=
new
QToolButton
(
this
)
;
setupButton
(
frameButton
);
CONNECT_MAP_SET
(
frameButton
,
FRAME_ACTION
);
BUTTON_SET_BAR
(
frameButton
);
...
...
@@ -260,7 +260,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
FULLSCREEN_BUTTON
:{
QToolButton
*
fullscreenButton
=
new
QToolButton
;
QToolButton
*
fullscreenButton
=
new
QToolButton
(
this
)
;
setupButton
(
fullscreenButton
);
CONNECT_MAP_SET
(
fullscreenButton
,
FULLSCREEN_ACTION
);
BUTTON_SET_BAR
(
fullscreenButton
);
...
...
@@ -269,7 +269,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
DEFULLSCREEN_BUTTON
:{
QToolButton
*
fullscreenButton
=
new
QToolButton
;
QToolButton
*
fullscreenButton
=
new
QToolButton
(
this
)
;
setupButton
(
fullscreenButton
);
CONNECT_MAP_SET
(
fullscreenButton
,
FULLSCREEN_ACTION
);
BUTTON_SET_BAR
(
fullscreenButton
)
...
...
@@ -278,7 +278,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
EXTENDED_BUTTON
:{
QToolButton
*
extSettingsButton
=
new
QToolButton
;
QToolButton
*
extSettingsButton
=
new
QToolButton
(
this
)
;
setupButton
(
extSettingsButton
);
CONNECT_MAP_SET
(
extSettingsButton
,
EXTENDED_ACTION
);
BUTTON_SET_BAR
(
extSettingsButton
)
...
...
@@ -286,7 +286,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
PLAYLIST_BUTTON
:{
QToolButton
*
playlistButton
=
new
QToolButton
;
QToolButton
*
playlistButton
=
new
QToolButton
(
this
)
;
setupButton
(
playlistButton
);
CONNECT_MAP_SET
(
playlistButton
,
PLAYLIST_ACTION
);
BUTTON_SET_BAR
(
playlistButton
);
...
...
@@ -294,7 +294,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
SNAPSHOT_BUTTON
:{
QToolButton
*
snapshotButton
=
new
QToolButton
;
QToolButton
*
snapshotButton
=
new
QToolButton
(
this
)
;
setupButton
(
snapshotButton
);
CONNECT_MAP_SET
(
snapshotButton
,
SNAPSHOT_ACTION
);
BUTTON_SET_BAR
(
snapshotButton
);
...
...
@@ -303,7 +303,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
RECORD_BUTTON
:{
QToolButton
*
recordButton
=
new
QToolButton
;
QToolButton
*
recordButton
=
new
QToolButton
(
this
)
;
setupButton
(
recordButton
);
CONNECT_MAP_SET
(
recordButton
,
RECORD_ACTION
);
BUTTON_SET_BAR
(
recordButton
);
...
...
@@ -315,7 +315,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
ATOB_BUTTON
:
{
AtoB_Button
*
ABButton
=
new
AtoB_Button
;
AtoB_Button
*
ABButton
=
new
AtoB_Button
(
this
)
;
setupButton
(
ABButton
);
BUTTON_SET_BAR
(
ABButton
);
ENABLE_ON_INPUT
(
ABButton
);
...
...
@@ -361,7 +361,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
break
;
case
SPLITTER
:
{
QFrame
*
line
=
new
QFrame
;
QFrame
*
line
=
new
QFrame
(
this
)
;
line
->
setFrameShape
(
QFrame
::
VLine
);
line
->
setFrameShadow
(
QFrame
::
Raised
);
line
->
setLineWidth
(
0
);
...
...
@@ -376,7 +376,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
REVERSE_BUTTON
:{
QToolButton
*
reverseButton
=
new
QToolButton
;
QToolButton
*
reverseButton
=
new
QToolButton
(
this
)
;
setupButton
(
reverseButton
);
CONNECT_MAP_SET
(
reverseButton
,
REVERSE_ACTION
);
BUTTON_SET_BAR
(
reverseButton
);
...
...
@@ -385,7 +385,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
SKIP_BACK_BUTTON
:
{
QToolButton
*
skipBakButton
=
new
QToolButton
;
QToolButton
*
skipBakButton
=
new
QToolButton
(
this
)
;
setupButton
(
skipBakButton
);
CONNECT_MAP_SET
(
skipBakButton
,
SKIP_BACK_ACTION
);
BUTTON_SET_BAR
(
skipBakButton
);
...
...
@@ -394,7 +394,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
SKIP_FW_BUTTON
:
{
QToolButton
*
skipFwButton
=
new
QToolButton
;
QToolButton
*
skipFwButton
=
new
QToolButton
(
this
)
;
setupButton
(
skipFwButton
);
CONNECT_MAP_SET
(
skipFwButton
,
SKIP_FW_ACTION
);
BUTTON_SET_BAR
(
skipFwButton
);
...
...
@@ -403,7 +403,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break
;
case
QUIT_BUTTON
:
{
QToolButton
*
quitButton
=
new
QToolButton
;
QToolButton
*
quitButton
=
new
QToolButton
(
this
)
;
setupButton
(
quitButton
);
CONNECT_MAP_SET
(
quitButton
,
QUIT_ACTION
);
BUTTON_SET_BAR
(
quitButton
);
...
...
@@ -480,7 +480,7 @@ QFrame *AbstractController::telexFrame()
/**
* Telextext QFrame
**/
TeletextController
*
telexFrame
=
new
TeletextController
;
TeletextController
*
telexFrame
=
new
TeletextController
(
this
)
;
QHBoxLayout
*
telexLayout
=
new
QHBoxLayout
(
telexFrame
);
telexLayout
->
setSpacing
(
0
);
telexLayout
->
setMargin
(
0
);
CONNECT
(
THEMIM
->
getIM
(),
teletextPossible
(
bool
),
...
...
@@ -625,8 +625,8 @@ InputControlsWidget::InputControlsWidget( intf_thread_t *_p_i, QWidget *_parent
/**********************************************************************
* Fullscrenn control widget
**********************************************************************/
FullscreenControllerWidget
::
FullscreenControllerWidget
(
intf_thread_t
*
_p_i
)
:
AbstractController
(
_p_i
)
FullscreenControllerWidget
::
FullscreenControllerWidget
(
intf_thread_t
*
_p_i
,
QWidget
*
parent
)
:
AbstractController
(
_p_i
,
parent
)
{
i_mouse_last_x
=
-
1
;
i_mouse_last_y
=
-
1
;
...
...
modules/gui/qt4/components/controller.hpp
View file @
1463e7cb
...
...
@@ -227,7 +227,7 @@ class FullscreenControllerWidget : public AbstractController
{
Q_OBJECT
public:
FullscreenControllerWidget
(
intf_thread_t
*
);
FullscreenControllerWidget
(
intf_thread_t
*
,
QWidget
*
parent
);
virtual
~
FullscreenControllerWidget
();
/* Vout */
...
...
modules/gui/qt4/components/controller_widget.hpp
View file @
1463e7cb
...
...
@@ -51,6 +51,8 @@ class QAbstractSlider;
class
PlayButton
:
public
QToolButton
{
Q_OBJECT
public:
PlayButton
(
QWidget
*
parent
)
:
QToolButton
(
parent
)
{
}
private
slots
:
void
updateButton
(
bool
);
};
...
...
@@ -58,6 +60,8 @@ private slots:
class
AtoB_Button
:
public
QToolButton
{
Q_OBJECT
public:
AtoB_Button
(
QWidget
*
parent
)
:
QToolButton
(
parent
)
{
}
private
slots
:
void
setIcons
(
bool
,
bool
);
};
...
...
@@ -66,6 +70,10 @@ class TeletextController : public QFrame
{
Q_OBJECT
friend
class
AbstractController
;
public:
TeletextController
(
QWidget
*
parent
)
:
QFrame
(
parent
)
{
}
private:
QToolButton
*
telexTransparent
,
*
telexOn
;
QSpinBox
*
telexPage
;
...
...
modules/gui/qt4/main_interface.cpp
View file @
1463e7cb
...
...
@@ -436,7 +436,7 @@ void MainInterface::handleMainUi( QSettings *settings )
/* Create the FULLSCREEN CONTROLS Widget */
if
(
config_GetInt
(
p_intf
,
"qt-fs-controller"
)
)
{
fullscreenControls
=
new
FullscreenControllerWidget
(
p_intf
);
fullscreenControls
=
new
FullscreenControllerWidget
(
p_intf
,
this
);
}
}
...
...
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