Commit 2374e7bc authored by Clément Stenac's avatar Clément Stenac

Fix playlist unable to terminate (Closes:#829)

parent d6305102
...@@ -493,7 +493,7 @@ static int Demux( demux_t *p_demux ) ...@@ -493,7 +493,7 @@ static int Demux( demux_t *p_demux )
#endif #endif
} }
HANDLE_PLAY_AND_RELEASE; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -290,7 +290,7 @@ static int Demux( demux_t *p_demux ) ...@@ -290,7 +290,7 @@ static int Demux( demux_t *p_demux )
} }
HANDLE_PLAY_AND_RELEASE; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -128,7 +128,7 @@ static int Demux( demux_t *p_demux ) ...@@ -128,7 +128,7 @@ static int Demux( demux_t *p_demux )
} }
HANDLE_PLAY_AND_RELEASE; HANDLE_PLAY_AND_RELEASE;
return VLC_SUCCESS; return -1; /* Needed for correct operation of go back */
} }
static struct static struct
......
...@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux ) ...@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux )
p_sys->p_playlist = NULL; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -197,7 +197,7 @@ static int Demux( demux_t *p_demux ) ...@@ -197,7 +197,7 @@ static int Demux( demux_t *p_demux )
} }
} }
HANDLE_PLAY_AND_RELEASE; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux ) ...@@ -228,7 +228,7 @@ static int Demux( demux_t *p_demux )
} }
HANDLE_PLAY_AND_RELEASE; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -325,7 +325,7 @@ static int Demux( demux_t *p_demux ) ...@@ -325,7 +325,7 @@ static int Demux( demux_t *p_demux )
} }
HANDLE_PLAY_AND_RELEASE; 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -383,7 +383,7 @@ static int Demux( demux_t *p_demux ) ...@@ -383,7 +383,7 @@ static int Demux( demux_t *p_demux )
FREE( psz_src ); FREE( psz_src );
FREE( psz_mimetype ); 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -409,7 +409,7 @@ static int Demux ( demux_t *p_demux ) ...@@ -409,7 +409,7 @@ static int Demux ( demux_t *p_demux )
playlist_BothAddInput( p_playlist, p_child, p_item_in_category, playlist_BothAddInput( p_playlist, p_child, p_item_in_category,
PLAYLIST_APPEND, PLAYLIST_END ); PLAYLIST_APPEND, PLAYLIST_END );
HANDLE_PLAY_AND_RELEASE 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 ) static int Control( demux_t *p_demux, int i_query, va_list args )
......
...@@ -152,7 +152,7 @@ static int Demux( demux_t *p_demux ) ...@@ -152,7 +152,7 @@ static int Demux( demux_t *p_demux )
HANDLE_PLAY_AND_RELEASE; HANDLE_PLAY_AND_RELEASE;
p_sys->p_playlist = NULL; p_sys->p_playlist = NULL;
return VLC_SUCCESS; return -1; /* Needed for correct operation of go back */
} }
#define GET_VALUE( a ) \ #define GET_VALUE( a ) \
......
...@@ -124,7 +124,7 @@ int Demux( demux_t *p_demux ) ...@@ -124,7 +124,7 @@ int Demux( demux_t *p_demux )
xml_ReaderDelete( p_xml, p_xml_reader ); xml_ReaderDelete( p_xml, p_xml_reader );
if( p_xml ) if( p_xml )
xml_Delete( 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 */ /** \brief dummy function for demux callback interface */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment