RAOP: use vlc_strerror_c()

[vlc] / modules / stream_out / raop.c

diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index f4cf3c48080cfa992284f6a05cfe5d7457f959b6..825f42e0e3b8dc3b41a30882b5de2b4f1fa21772 100644 (file)
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * raop.c: Remote Audio Output Protocol streaming support
  *****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008 VLC authors and VideoLAN
  * $Id$
  *
  * Author: Michael Hanselmann
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -39,9 +39,11 @@
 #include <vlc_network.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_gcrypt.h>
 #include <vlc_es.h>
 #include <vlc_http.h>
+#include <vlc_memory.h>
 
 #define RAOP_PORT 5000
 #define RAOP_USER_AGENT "VLC " VERSION
@@ -162,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()
@@ -546,10 +548,11 @@ 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 );
+        msg_Err( p_this, "Unable to open password file '%s': %s", psz_path,
+                 vlc_strerror_c(errno) );
         goto error;
     }
 
@@ -558,7 +561,8 @@ static char *ReadPasswordFile( vlc_object_t *p_this, const char *psz_path )
     {
         if ( ferror( p_file ) )
         {
-            msg_Err( p_this, "Error reading '%s': %m", psz_path );
+            msg_Err( p_this, "Error reading '%s': %s", psz_path,
+                     vlc_strerror_c(errno) );
             goto error;
         }
 
@@ -575,7 +579,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;
     }
@@ -1213,7 +1217,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;
@@ -1299,7 +1303,7 @@ static void SendAudio( sout_stream_t *p_stream, block_t *p_buffer )
             /* Grow in blocks of 4K */
             i_realloc_len = (1 + (i_len / 4096)) * 4096;
 
-            p_sys->p_sendbuf = realloc( p_sys->p_sendbuf, i_realloc_len );
+            p_sys->p_sendbuf = realloc_or_free( p_sys->p_sendbuf, i_realloc_len );
             if ( p_sys->p_sendbuf == NULL )
                 goto error;
 
@@ -1388,11 +1392,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;
@@ -1440,8 +1444,8 @@ static int Open( vlc_object_t *p_this )
                                           RAOP_PORT );
     if ( p_sys->i_control_fd < 0 )
     {
-        msg_Err( p_this, "Cannot establish control connection to %s:%d (%m)",
-                 p_sys->psz_host, RAOP_PORT );
+        msg_Err( p_this, "Cannot establish control connection to %s:%d (%s)",
+                 p_sys->psz_host, RAOP_PORT, vlc_strerror_c(errno) );
         i_err = VLC_EGENERIC;
         goto error;
     }
@@ -1524,8 +1528,9 @@ static int Open( vlc_object_t *p_this )
                                          p_sys->i_server_port );
     if ( p_sys->i_stream_fd < 0 )
     {
-        msg_Err( p_this, "Cannot establish stream connection to %s:%d (%m)",
-                 p_sys->psz_host, p_sys->i_server_port );
+        msg_Err( p_this, "Cannot establish stream connection to %s:%d (%s)",
+                 p_sys->psz_host, p_sys->i_server_port,
+                 vlc_strerror_c(errno)  );
         i_err = VLC_EGENERIC;
         goto error;
     }
@@ -1552,8 +1557,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--;
 }