Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / modules / demux / sgimb.c

diff --git a/modules/demux/sgimb.c b/modules/demux/sgimb.c
index 3d6274581b68a62b9e7ef64497a2de41eb055787..08e5736277de81c86902b08c021306e1c4bc931f 100644 (file)
--- a/modules/demux/sgimb.c
+++ b/modules/demux/sgimb.c
@@ -18,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -110,7 +110,7 @@ static int  Activate  ( vlc_object_t * );
 static void Deactivate( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Kasenna MediaBase metademux") );
+    set_description( _("Kasenna MediaBase parser") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 170 );
@@ -337,7 +337,7 @@ static int Demux ( demux_t *p_demux )
     playlist_t      *p_playlist;
     playlist_item_t *p_item;
     playlist_item_t *p_child;
-    
+
     char            *psz_line;
 
     p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
@@ -375,10 +375,10 @@ static int Demux ( demux_t *p_demux )
         if( p_sys->psz_server && p_sys->psz_location )
         {
             char *temp;
-            
+
             asprintf( &temp, "rtsp://" "%s:%i%s",
                      p_sys->psz_server, p_sys->i_port > 0 ? p_sys->i_port : 554, p_sys->psz_location );
-            
+
             p_sys->psz_uri = strdup( temp );
             free( temp );
         }
@@ -395,7 +395,7 @@ static int Demux ( demux_t *p_demux )
             msg_Err( p_demux, "no URI was found" );
             return -1;
         }
-        
+
         asprintf( &temp, "%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE",
                 p_sys->psz_uri, p_sys->i_sid );
 
@@ -404,6 +404,8 @@ static int Demux ( demux_t *p_demux )
         free( temp );
     }
 
+    msg_Err( p_playlist, "SGIMB playlist handling is broken" );
+#if 0
     p_child = playlist_ItemNew( p_playlist, p_sys->psz_uri,
                       p_sys->psz_name ? p_sys->psz_name : p_sys->psz_uri );
 
@@ -424,9 +426,9 @@ static int Demux ( demux_t *p_demux )
     if( !p_sys->psz_mcast_ip )
     {
         char *psz_option;
-       asprintf( &psz_option, "rtsp-caching=5000" );
-       playlist_ItemAddOption( p_child, psz_option );
-       free( psz_option );
+        asprintf( &psz_option, "rtsp-caching=5000" );
+        playlist_ItemAddOption( p_child, psz_option );
+        free( psz_option );
     }
     if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna )
     {
@@ -442,7 +444,7 @@ static int Demux ( demux_t *p_demux )
     playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
                            p_playlist->status.i_view,
                            p_playlist->status.p_item, NULL );
-
+#endif
     vlc_object_release( p_playlist );
     return VLC_SUCCESS;
 }