Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
b95136f6
Commit
b95136f6
authored
Oct 30, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless parameter
parent
62fd975c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
13 deletions
+12
-13
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+1
-1
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+1
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+6
-7
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+3
-3
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-1
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
b95136f6
...
...
@@ -144,7 +144,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
updateGeometry
();
// Needed for deinterlace
}
void
VideoWidget
::
release
(
void
*
p_win
)
void
VideoWidget
::
release
(
void
)
{
msg_Dbg
(
p_intf
,
"Video is not needed anymore"
);
p_vout
=
NULL
;
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
b95136f6
...
...
@@ -60,7 +60,7 @@ public:
void
*
request
(
vout_thread_t
*
,
int
*
,
int
*
,
unsigned
int
*
,
unsigned
int
*
);
void
release
(
void
*
);
void
release
(
void
);
int
control
(
void
*
,
int
,
va_list
);
virtual
QSize
sizeHint
()
const
;
...
...
modules/gui/qt4/main_interface.cpp
View file @
b95136f6
...
...
@@ -206,8 +206,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* VideoWidget connects to avoid different threads speaking to each other */
CONNECT
(
this
,
askReleaseVideo
(
void
*
),
this
,
releaseVideoSlot
(
void
*
)
);
CONNECT
(
this
,
askReleaseVideo
(
void
),
this
,
releaseVideoSlot
(
void
)
);
if
(
videoWidget
)
CONNECT
(
this
,
askVideoToResize
(
unsigned
int
,
unsigned
int
),
videoWidget
,
SetSizing
(
unsigned
int
,
unsigned
int
)
);
...
...
@@ -650,17 +650,16 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
}
/* Call from the WindowClose function */
void
MainInterface
::
releaseVideo
(
void
*
p_win
)
void
MainInterface
::
releaseVideo
(
void
)
{
if
(
fullscreenControls
)
fullscreenControls
->
detachVout
();
if
(
p_win
)
emit
askReleaseVideo
(
p_win
);
emit
askReleaseVideo
(
);
}
/* Function that is CONNECTED to the previous emit */
void
MainInterface
::
releaseVideoSlot
(
void
*
p_win
)
void
MainInterface
::
releaseVideoSlot
(
void
)
{
videoWidget
->
release
(
p_win
);
videoWidget
->
release
(
);
if
(
bgWasVisible
)
{
...
...
modules/gui/qt4/main_interface.hpp
View file @
b95136f6
...
...
@@ -79,7 +79,7 @@ public:
void
*
requestVideo
(
vout_thread_t
*
p_nvout
,
int
*
pi_x
,
int
*
pi_y
,
unsigned
int
*
pi_width
,
unsigned
int
*
pi_height
);
void
releaseVideo
(
void
*
);
void
releaseVideo
(
void
);
int
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
);
/* Getters */
...
...
@@ -159,7 +159,7 @@ public slots:
void
toggleFSC
();
/* Manage the Video Functions from the vout threads */
void
releaseVideoSlot
(
void
*
);
void
releaseVideoSlot
(
void
);
private
slots
:
void
debug
();
...
...
@@ -177,7 +177,7 @@ private slots:
void
showSpeedMenu
(
QPoint
);
void
updateRecentsMenu
();
signals:
void
askReleaseVideo
(
void
*
);
void
askReleaseVideo
(
);
void
askVideoToResize
(
unsigned
int
,
unsigned
int
);
void
askVideoToToggle
();
void
askBgWidgetToToggle
();
...
...
modules/gui/qt4/qt4.cpp
View file @
b95136f6
...
...
@@ -557,5 +557,5 @@ static void WindowClose (vlc_object_t *obj)
QMutexLocker
locker
(
&
iface
.
lock
);
msg_Dbg
(
obj
,
"releasing video..."
);
p_mi
->
releaseVideo
(
wnd
->
handle
);
p_mi
->
releaseVideo
();
}
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