Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
43b06eed
Commit
43b06eed
authored
Dec 15, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: use the new playlist_Pause() where appropriate
This fixes corking especially.
parent
a437fe54
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
19 deletions
+4
-19
modules/control/dbus/dbus_player.c
modules/control/dbus/dbus_player.c
+1
-8
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+1
-6
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+1
-4
src/playlist/engine.c
src/playlist/engine.c
+1
-1
No files found.
modules/control/dbus/dbus_player.c
View file @
43b06eed
...
...
@@ -215,14 +215,7 @@ DBUS_METHOD( Play )
DBUS_METHOD
(
Pause
)
{
REPLY_INIT
;
input_thread_t
*
p_input
=
pl_CurrentInput
(
p_this
);
if
(
p_input
&&
var_GetInteger
(
p_input
,
"state"
)
==
PLAYING_S
)
playlist_TogglePause
(
PL
);
if
(
p_input
)
vlc_object_release
(
p_input
);
playlist_Pause
(
PL
);
REPLY_SEND
;
}
...
...
modules/gui/macosx/CoreInteraction.m
View file @
43b06eed
...
...
@@ -95,12 +95,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
{
playlist_t
*
p_playlist
=
pl_Get
(
VLCIntf
);
PL_LOCK
;
bool
b_playlist_playing
=
playlist_Status
(
p_playlist
)
==
PLAYLIST_RUNNING
;
PL_UNLOCK
;
if
(
b_playlist_playing
)
playlist_TogglePause
(
p_playlist
);
playlist_Pause
(
p_playlist
);
}
-
(
void
)
stop
...
...
modules/gui/qt4/input_manager.cpp
View file @
43b06eed
...
...
@@ -1129,10 +1129,7 @@ void MainInputManager::play()
void
MainInputManager
::
pause
()
{
if
(
p_input
&&
PLAYING_S
==
var_GetInteger
(
p_input
,
"state"
)
)
{
playlist_TogglePause
(
THEPL
);
}
playlist_Pause
(
THEPL
);
}
void
MainInputManager
::
toggleRandom
()
...
...
src/playlist/engine.c
View file @
43b06eed
...
...
@@ -89,7 +89,7 @@ static int CorksCallback( vlc_object_t *obj, char const *var,
if
(
var_InheritBool
(
obj
,
"playlist-cork"
)
)
{
msg_Dbg
(
obj
,
"corked"
);
playlist_
Toggle
Pause
(
pl
);
playlist_Pause
(
pl
);
}
else
msg_Dbg
(
obj
,
"not corked"
);
...
...
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