Changeset a2dd91771917aa86d9e94aa2d6777f8805332e63

Timestamp:

10/17/07 20:36:22 (11 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1192646182 +0000

git-parent:

[7b3eb71e858bfcb3f22d07985f27226306e26ce2]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1192646182 +0000

Message:

Add Icecast support to profiles.

Files:

• include/vlc_streaming.h (modified) (4 diffs)
• src/stream_output/profiles.c (modified) (6 diffs)

include/vlc_streaming.h

@@ -122 +122 @@
-struct sout_transcode_t
-{
-
+
+
+
-    float f_scale;
-    vlc_bool_t b_soverlay;
-    char *psz_vcodec;
-
+
+
+
+
-    char *psz_additional;
-
-
+
+
-};
-void streaming_TranscodeParametersApply( sout_transcode_t *p_module );
@@ -137 +143 @@
-struct sout_std_t
-{
-
-
-
+
+
+
+
+
+
+
-};
-void streaming_StdParametersApply( sout_std_t *p_module );
@@ -151 +161 @@
-struct sout_duplicate_t
-{
-
+
+
-    sout_chain_t **pp_children;
-    char **ppsz_conditions;
@@ -202 +213 @@
-};
-
+/** struct for holding account information needed to access the services */
+struct streaming_account_t
+{
+    char *psz_username; /*< username of account */
+    char *psz_password; /*< password of account */
+};
+
-/**************** GUI interaction *****************/
+/** struct to hold user interface information */
-struct sout_gui_descr_t
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Mux */
-
+      /*< name of muxer to use in streaming */
-
-    /* Transcode */
-
-
-
-
+
+
+
+
+
+
+
+
-
-    /* Misc */
-
-
-
+
+
+
+
+
+
+
+
+
-};
-

src/stream_output/profiles.c

@@ -265 +265 @@
-        pd->b_file = VLC_TRUE; pd->psz_file = strdup( STDM->psz_url ); \
-    } \
- 
+
-    { \
-        pd->b_http = VLC_TRUE; pd->psz_http = strdup( STDM->psz_url ); \
-    } \
- 
+
-    { \
-        pd->b_mms = VLC_TRUE; pd->psz_mms = strdup( STDM->psz_url ); \
-    } \
- 
+
-    { \
-        pd->b_udp = VLC_TRUE; pd->psz_udp = strdup( STDM->psz_url ); \
@@ -379 +379 @@
-    sout_duplicate_t *p_dup = NULL;
-    (void)p_obj;
+
-    /* Clean up the chain */
-    streaming_ChainClean( p_chain );
@@ -393 +394 @@
-    /* #std{} */
-    if( pd->b_local + pd->b_file + pd->b_http + pd->b_mms + pd->b_rtp +
-
++ pd->b_icecast 
-    {
-        p_dup = streaming_ChainAddDup( p_chain );
@@ -425 +426 @@
-                                           pd->psz_mux, pd->psz_udp );
-        }
-
+
+
-        if( pd->b_sap )
-        {
@@ -432 +434 @@
-            p_std->psz_group = pd->psz_group ? strdup( pd->psz_group ) : NULL;
-        }
+    }
+    if( pd->b_icecast )
+    {
+        sout_std_t *p_std;
+        char *psz_username;
+
+        if( p_dup ) streaming_DupAddChild( p_dup );
+
+        if( !strcmp( pd->sa_icecast.psz_username, "" ) )
+        {
+            asprintf( &psz_username, "%s", "" );
+        }
+        else
+        {
+            asprintf( &psz_username, "%s:%s@", pd->sa_icecast.psz_username,
+                      pd->sa_icecast.psz_password );
+        }
+        if( pd->i_icecast > 0 )
+        {
+            char *psz_url;
+            asprintf( &psz_url, "%s%s:%i%s", psz_username, pd->psz_icecast,
+                      pd->i_icecast, pd->psz_mountpoint );
+            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "shout",
+                                           pd->psz_mux, psz_url );
+            free( psz_url );
+        }
+        else
+        {
+            char *psz_url;
+            asprintf( &psz_url, "%s:%s@%s%s", pd->sa_icecast.psz_username,
+                      pd->sa_icecast.psz_password, pd->psz_icecast,
+                      pd->psz_mountpoint );
+            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "shout",
+                                           pd->psz_mux, psz_url );
+            free( psz_url );
+        }
+        free( psz_username );
-    }
-    HANDLE_GUI_URL( http, "http" )
@@ -491 +530 @@
-
-        case SOUT_MOD_DISPLAY:
-
+;
-            break;
-        case SOUT_MOD_STD:
-url
+dst
-                          STDM->psz_url, STDM->psz_mux );
+            break;
-        }
-        if( i != p_chain->i_modules - 1 ) CHAIN_APPEND( ":" );