Fix playlist unable to terminate (Closes:#829)

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index e7f6ea213980e9d7704cb521c2ad04c3339920c4..472d225a014baf6af3c5d95ec56dc4727899f2ad 100644 (file)
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -493,7 +493,7 @@ static int Demux( demux_t *p_demux )
 #endif
     }
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 49729a6cee156b89c7db65d84d99abaf64eaa4ae..2ab29e092c27cc03617a9fcb78f17ad5ca181183 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -290,7 +290,7 @@ static int Demux( demux_t *p_demux )
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 1af284c58073ab948475786ff0d649d297f4e404..bd3a56c2bfd9bf5f7ad200a601cadd06d5a8abc0 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -128,7 +128,7 @@ static int Demux( demux_t *p_demux )
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static struct

diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index 81f5de8675b7a904e3de2c4e87ad805e3a52c16d..b81a5ffef807f9668b5d9c80a46cc09dbeef2674 100644 (file)
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux )
 
     p_sys->p_playlist = NULL;
 
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index 3c45ad2acae01df2df1d80c35847211d2a67708c..124c4b86b4cfa525351a46a6f5fb8cd94974ada3 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -197,7 +197,7 @@ static int Demux( demux_t *p_demux )
         }
     }
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index ebd89c91a0dbcc83a16d6b2aa5785416270bd6e6..158ce4d3df33ca1b9ff86187ffe7b197a0215de4 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux )
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index c1de9b8319c7d2c4a2ca2fdfa606f6b5584582bf..d8a020baa54226844734d7d6c86cc35c692f0a2c 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -325,7 +325,7 @@ static int Demux( demux_t *p_demux )
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index 792ed4dc66ee88cfb2e2ed17ab942d30376ca7ca..3f499a8292296b164bee90249c17ab1cadd3f55a 100644 (file)
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -383,7 +383,7 @@ static int Demux( demux_t *p_demux )
     FREE( psz_src );
     FREE( psz_mimetype );
 
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index 1564f89bfe5140378a7abdd48b1273f96ffb1adf..9f00eac6e0234fc3263e42bbf870a21c3b11bc1e 100644 (file)
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -409,7 +409,7 @@ static int Demux ( demux_t *p_demux )
     playlist_BothAddInput( p_playlist, p_child, p_item_in_category,
                            PLAYLIST_APPEND, PLAYLIST_END );
     HANDLE_PLAY_AND_RELEASE
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 862287f278d75de1bb1d7e861233693f16bb80d1..199f8d024849c099043c0452bdce1eef425409f5 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -152,7 +152,7 @@ static int Demux( demux_t *p_demux )
 
     HANDLE_PLAY_AND_RELEASE;
     p_sys->p_playlist = NULL;
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 #define GET_VALUE( a ) \

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 11c3ad447228d619726d83251f674d1c9fa40da6..83f8a592e9e3c67e8c83179b0be97770f7dc3563 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -124,7 +124,7 @@ int Demux( demux_t *p_demux )
         xml_ReaderDelete( p_xml, p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 /** \brief dummy function for demux callback interface */