[vlc-devel] commit: input: With --play-and-pause don't pause non pausable stream. ( Pierre d'Herbemont )

git version control git at videolan.org
Sat Dec 26 16:16:20 CET 2009


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sat Dec 26 15:18:06 2009 +0100| [73ac0ce9d1078b6604278f8a38d27457e0e33af8] | committer: Pierre d'Herbemont 

input: With --play-and-pause don't pause non pausable stream.

Else, this results in triggering the timeshift module.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73ac0ce9d1078b6604278f8a38d27457e0e33af8
---

 src/input/input.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index ef9cf3e..91b8d25 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -750,7 +750,9 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
                 msg_Dbg( p_input, "waiting decoder fifos to empty" );
                 i_wakeup = mdate() + INPUT_IDLE_SLEEP;
             }
-            else if( b_pause_after_eof )
+            /* Pause after eof only if the input is pausable.
+             * This way we won't trigger timeshifting for nothing */
+            else if( b_pause_after_eof && p_input->p->b_can_pause )
             {
                 msg_Dbg( p_input, "pausing at EOF (pause after each)");
                 val.i_int = PAUSE_S;




More information about the vlc-devel mailing list