Untested workarround for buggy asx files with an end of line char at the end of the...

[vlc] / modules / demux / playlist / playlist.h

diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index 4e5fd2c04073d3ca16b3d70ed3f11dfd2797c591..0e71ab2b799cc4c53facfce2a7135b246e813c1b 100644 (file)
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * playlist.h:  Playlist import module common functions
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,17 +18,79 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-char *ProcessMRL( char *, char * );
-char *FindPrefix( demux_t * );
+#include <vlc_playlist.h>
+char *E_(ProcessMRL)( char *, char * );
+char *E_(FindPrefix)( demux_t * );
 
-int Import_Old ( vlc_object_t * );
-int Import_M3U ( vlc_object_t * );
-int Import_Native ( vlc_object_t * );
-int Close_Native ( vlc_object_t * );
+vlc_bool_t E_(FindItem)( demux_t *, playlist_t *, playlist_item_t **);
+
+void E_(AddToPlaylist)( demux_t *, playlist_t*,input_item_t*,playlist_item_t*,int );
+
+int E_(Import_Old) ( vlc_object_t * );
+
+int E_(Import_Native) ( vlc_object_t * );
+void E_(Close_Native) ( vlc_object_t * );
+
+int E_(Import_M3U) ( vlc_object_t * );
+void E_(Close_M3U) ( vlc_object_t * );
+
+int E_(Import_PLS) ( vlc_object_t * );
+void E_(Close_PLS) ( vlc_object_t * );
+
+int E_(Import_B4S) ( vlc_object_t * );
+void E_(Close_B4S) ( vlc_object_t * );
+
+int E_(Import_DVB) ( vlc_object_t * );
+void E_(Close_DVB) ( vlc_object_t * );
+
+int E_(Import_podcast) ( vlc_object_t * );
+void E_(Close_podcast) ( vlc_object_t * );
+
+int E_(Import_xspf) ( vlc_object_t * );
+void E_(Close_xspf) ( vlc_object_t * );
+
+int E_(Import_Shoutcast) ( vlc_object_t * );
+void E_(Close_Shoutcast) ( vlc_object_t * );
+
+int E_(Import_ASX) ( vlc_object_t * );
+void E_(Close_ASX) ( vlc_object_t * );
+
+int E_(Import_SGIMB) ( vlc_object_t * );
+void E_(Close_SGIMB) ( vlc_object_t * );
+
+int E_(Import_QTL) ( vlc_object_t * );
+void E_(Close_QTL) ( vlc_object_t * );
+
+int E_(Import_GVP) ( vlc_object_t * );
+void E_(Close_GVP) ( vlc_object_t * );
+
+int E_(Import_IFO) ( vlc_object_t * );
+void E_(Close_IFO) ( vlc_object_t * );
+
+int E_(Import_VideoPortal) ( vlc_object_t * );
+void E_(Close_VideoPortal) ( vlc_object_t * );
+
+#define INIT_PLAYLIST_STUFF \
+    playlist_t *p_playlist = pl_Yield( p_demux ); \
+    vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" ); \
+    input_thread_t *p_input_thread = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); \
+    input_item_t *p_current_input = input_GetItem( p_input_thread ); \
+    playlist_item_t *p_current = \
+                 playlist_ItemGetByInput( p_playlist, p_current_input, VLC_FALSE ); \
+    playlist_item_t *p_item_in_category = \
+                            playlist_ItemToNode( p_playlist, p_current, \
+                                                 VLC_TRUE ); \
+    b_play = b_play && p_current == p_playlist->status.p_item; \
+    if( p_item_in_category ) \
+        p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
+
+#define HANDLE_PLAY_AND_RELEASE \
+    /* Go back and play the playlist */ \
+    if( b_play && p_item_in_category ) \
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_item_in_category, NULL ); \
+    vlc_object_release( p_input_thread ); \
+    vlc_object_release( p_playlist );
 
-void Close_M3U ( vlc_object_t * );
-int Import_PLS ( vlc_object_t * );
-void Close_PLS ( vlc_object_t * );