Changeset 375abfbdd16fa92a9a23f94a87d1b6ce0ca48c25

Timestamp:

26/08/05 19:01:48 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1125075708 +0000

git-parent:

[7c896d67cfe224d0d0fa21b52d02e167be0f9607]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1125075708 +0000

Message:

* added --sout-shout-name to set a stream name
* added --sout-shout-description to set a channel description
* added --sout-shout-mp3 to allow you to upload mp3 streams instead of ogg. (BEWARE, no autodetection)
* fixed the free of a string
* some general coding style cleanup

Files:

• modules/access_output/shout.c (modified) (11 diffs)

modules/access_output/shout.c

@@ -1 +1 @@
-/*****************************************************************************
-
+: This module forwards vorbis streams to an icecast server
- *****************************************************************************
- * Copyright (C) 2005 VideoLAN
@@ -26 +26 @@
- *
- * o this only works for ogg streams, and there's no checking about that yet.
- * o i have lots of problems with audio, but i think they are not caused
- *   by this patch
- * o there's a memleak somewhere, quite huge. i'm unsure if its somewhere
- *   in libshout, in vlc or even in this patch...
@@ -56 +54 @@
-
-#define SOUT_CFG_PREFIX "sout-shout-"
+
+#define NAME_TEXT N_("Stream-name")
+#define NAME_LONGTEXT N_("The name this stream/channel will get on the icecast server." )
+
+#define DESCRIPTION_TEXT N_("Stream-description")
+#define DESCRIPTION_LONGTEXT N_("A description of the stream content. (Information about " \
+                         "your channel)." )
+
+#define MP3_TEXT N_("Stream MP3")
+#define MP3_LONGTEXT N_("Normally you have to feed the shoutcast module with Ogg streams. " \
+                         "This option allows you to feed MP3 streams instead, so you can " \
+                         "forward MP3 streams to the icecast server." )
-
-vlc_module_begin();
@@ -64 +74 @@
-    set_subcategory( SUBCAT_SOUT_ACO );
-    add_shortcut( "shout" );
+    add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream", NULL,
+                NAME_TEXT, NAME_LONGTEXT, VLC_FALSE );
+    add_string( SOUT_CFG_PREFIX "description", "Live stream from VLC media player. " \
+                "http://www.videolan.org/vlc", NULL,
+                DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, VLC_FALSE );
+    add_bool(   SOUT_CFG_PREFIX "mp3", VLC_FALSE, NULL,
+                MP3_TEXT, MP3_LONGTEXT, VLC_TRUE );
-    set_callbacks( Open, Close );
-vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+    "name", "description", "mp3", NULL
+};
-
-
@@ -89 +113 @@
-    shout_t *p_shout;
-    long i_ret;
-
-    char *psz_user, *psz_pass, *psz_host, *psz_mount;
-    unsigned int i_port;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( !p_access->psz_name )
@@ -104 +138 @@
-
-    /* Parse connection data user:pwd@host:port/mountpoint */
-
-arser[0] && parser[0] != ':' ) 
-arser[0] ) { parser[0] = 0; 
-
-arser[0] && parser[0] != '@' ) 
-arser[0] ) { parser[0] = 0; 
-
-arser[0] && parser[0] != ':' ) 
-arser[0] ) { parser[0] = 0; 
-
-arser[0] && parser[0] != '/' ) 
-arser[0] ) { parser[0] = 0; 
-
+sz_p
+sz_parser[0] && psz_parser[0] != ':' ) psz_
+sz_parser[0] ) { psz_parser[0] = 0; psz_
+sz_p
+sz_parser[0] && psz_parser[0] != '@' ) psz_
+sz_parser[0] ) { psz_parser[0] = 0; psz_
+sz_p
+sz_parser[0] && psz_parser[0] != ':' ) psz_
+sz_parser[0] ) { psz_parser[0] = 0; psz_
+sz_p
+sz_parser[0] && psz_parser[0] != '/' ) psz_
+sz_parser[0] ) { psz_parser[0] = 0; psz_
+sz_p
-
-    i_port = atoi( tmp_port );
@@ -124 +158 @@
-    {
-        msg_Err( p_access, "out of memory" );
-arser
+sz_accessname
-        return VLC_ENOMEM;
-    }
+
+    var_Get( p_access, SOUT_CFG_PREFIX "name", &val );
+    if( *val.psz_string )
+        psz_name = val.psz_string;
+    else
+        free( val.psz_string );
+
+    var_Get( p_access, SOUT_CFG_PREFIX "description", &val );
+    if( *val.psz_string )
+        psz_description = val.psz_string;
+    else
+        free( val.psz_string );
-
-    p_shout = p_sys->p_shout = shout_new();
@@ -137 +183 @@
-         || shout_set_mount( p_shout, psz_mount ) != SHOUTERR_SUCCESS
-         || shout_set_user( p_shout, psz_user ) != SHOUTERR_SUCCESS
-
-
+
+
+
+
-      )
-    {
-
+/
-                 psz_host, i_port, psz_mount );
-        free( p_access->p_sys );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return VLC_EGENERIC;
-    }
@@ -164 +229 @@
-    if( i_ret != SHOUTERR_CONNECTED )
-    {
-
+/
-                 psz_host, i_port, psz_mount, shout_get_error(p_shout) );
-        free( p_access->p_sys );
-arser
+sz_accessname
-        return VLC_EGENERIC;
-    }
@@ -175 +240 @@
-    p_access->pf_seek  = Seek;
-
-
+/
-             psz_user, psz_host, i_port, psz_mount );
-
@@ -184 +249 @@
-    }
-
-
-
+
-
-    return VLC_SUCCESS;