Set up the encoder after the transcode filter chain

[vlc] / modules / stream_out / raop.c

diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index 9718a451b629816b54d0ca097fc6e143d5a8781d..7c21e5d4977700e8d38eed15abbd7fbf40d57e77 100644 (file)
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -164,13 +164,13 @@ vlc_module_begin();
     add_shortcut( "raop" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
-    add_string( SOUT_CFG_PREFIX "host", "", NULL,
+    add_string( SOUT_CFG_PREFIX "host", "",
                 HOST_TEXT, HOST_LONGTEXT, false )
-    add_password( SOUT_CFG_PREFIX "password", NULL, NULL,
+    add_password( SOUT_CFG_PREFIX "password", NULL,
                   PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
-    add_file( SOUT_CFG_PREFIX "password-file", NULL, NULL,
+    add_loadfile( SOUT_CFG_PREFIX "password-file", NULL,
               PASSWORD_FILE_TEXT, PASSWORD_FILE_LONGTEXT, false )
-    add_integer_with_range( SOUT_CFG_PREFIX "volume", 100, 0, 255, NULL,
+    add_integer_with_range( SOUT_CFG_PREFIX "volume", 100, 0, 255,
                             VOLUME_TEXT, VOLUME_LONGTEXT, false )
     set_callbacks( Open, Close )
 vlc_module_end()
@@ -548,7 +548,7 @@ static char *ReadPasswordFile( vlc_object_t *p_this, const char *psz_path )
     char *psz_newline;
     char ps_buffer[256];
 
-    p_file = utf8_fopen( psz_path, "rt" );
+    p_file = vlc_fopen( psz_path, "rt" );
     if ( p_file == NULL )
     {
         msg_Err( p_this, "Unable to open password file '%s': %m", psz_path );
@@ -577,7 +577,7 @@ static char *ReadPasswordFile( vlc_object_t *p_this, const char *psz_path )
             *psz_newline = '\0';
     }
 
-    if ( strlen( ps_buffer ) == 0 ) {
+    if ( *ps_buffer == '\0' ) {
         msg_Err( p_this, "No password could be read from '%s'", psz_path );
         goto error;
     }
@@ -1215,7 +1215,7 @@ static int UpdateVolume( vlc_object_t *p_this )
     /* Our volume is 0..255, RAOP is -144..0 (-144 off, -30..0 on) */
 
     /* Limit range */
-    p_sys->i_volume = __MAX( 0, __MIN( p_sys->i_volume, 255 ) );
+    p_sys->i_volume = VLC_CLIP( p_sys->i_volume, 0, 255 );
 
     if ( p_sys->i_volume == 0 )
         d_volume = -144.0;
@@ -1390,11 +1390,11 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    p_stream->p_sys = p_sys;
     p_stream->pf_add = Add;
     p_stream->pf_del = Del;
     p_stream->pf_send = Send;
-    p_stream->p_sout->i_out_pace_nocontrol++;
+    p_stream->p_sys = p_sys;
+    p_stream->pace_nocontrol = true;
 
     p_sys->i_control_fd = -1;
     p_sys->i_stream_fd = -1;
@@ -1554,8 +1554,6 @@ static void Close( vlc_object_t *p_this )
     SendTeardown( p_this );
 
     FreeSys( p_this, p_sys );
-
-    p_stream->p_sout->i_out_pace_nocontrol--;
 }