sap: Fix thread prototype.

[vlc] / src / stream_output / sap.c

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index ba9fdeeb23ae5b45ae5e3d18934e7b7c555d3f7a..fc84ed7961da53971473514cbc762f17ca68fb82 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <stdio.h>                                              /* sprintf() */
@@ -94,7 +94,7 @@ struct sap_session_t {
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void RunThread( vlc_object_t *p_this);
+static void * RunThread( vlc_object_t *p_this);
 static int ComputeRate( sap_address_t *p_address );
 
 static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
@@ -123,15 +123,10 @@ sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce )
     p_sap = vlc_custom_create( VLC_OBJECT(p_announce), sizeof( sap_handler_t ),
                                VLC_OBJECT_ANNOUNCE, "announce" );
     if( !p_sap )
-    {
-        msg_Err( p_announce, "out of memory" );
         return NULL;
-    }
 
     p_sap->psz_object_name = strdup( "sap announcer" );
 
-    vlc_mutex_init( &p_sap->object_lock );
-
     p_sap->pf_add = announce_SAPAnnounceAdd;
     p_sap->pf_del = announce_SAPAnnounceDel;
 
@@ -193,7 +188,7 @@ static void announce_SAPHandlerDestructor( vlc_object_t * p_this )
  * \param p_this the SAP Handler object
  * \return nothing
  */
-static void RunThread( vlc_object_t *p_this)
+static void * RunThread( vlc_object_t *p_this)
 {
     sap_handler_t *p_sap = (sap_handler_t*)p_this;
     sap_session_t *p_session;
@@ -215,7 +210,7 @@ static void RunThread( vlc_object_t *p_this)
         }
 
         /* Find the session to announce */
-        vlc_mutex_lock( &p_sap->object_lock );
+        vlc_object_lock( p_sap );
         if( p_sap->i_sessions > p_sap->i_current_session + 1)
         {
             p_sap->i_current_session++;
@@ -226,12 +221,12 @@ static void RunThread( vlc_object_t *p_this)
         }
         else
         {
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             msleep( SAP_IDLE );
             continue;
         }
         p_session = p_sap->pp_sessions[p_sap->i_current_session];
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
 
         /* And announce it */
         if( p_session->p_address->b_enabled == true &&
@@ -242,6 +237,7 @@ static void RunThread( vlc_object_t *p_this)
 
         msleep( SAP_IDLE );
     }
+    return NULL;
 }
 
 /* Add a SAP announce */
@@ -256,11 +252,11 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     struct sockaddr_storage addr;
     socklen_t addrlen;
 
-    vlc_mutex_lock( &p_sap->object_lock );
+    vlc_object_lock( p_sap );
     addrlen = p_session->addrlen;
     if ((addrlen == 0) || (addrlen > sizeof (addr)))
     {
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         msg_Err( p_sap, "No/invalid address specified for SAP announce" );
         return VLC_EGENERIC;
     }
@@ -327,7 +323,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
             {
                 msg_Err( p_sap, "Out-of-scope multicast address "
                          "not supported by SAP" );
-                vlc_mutex_unlock( &p_sap->object_lock );
+                vlc_object_unlock( p_sap );
                 return VLC_EGENERIC;
             }
 
@@ -336,7 +332,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
         }
 
         default:
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             msg_Err( p_sap, "Address family %d not supported by SAP",
                      addr.ss_family );
             return VLC_EGENERIC;
@@ -347,7 +343,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
 
     if( i )
     {
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         msg_Err( p_sap, "%s", vlc_gai_strerror( i ) );
         return VLC_EGENERIC;
     }
@@ -375,7 +371,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
                                     malloc( sizeof(sap_address_t) );
         if( !p_address )
         {
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             return VLC_ENOMEM;
         }
         p_address->psz_address = strdup( psz_addr );
@@ -438,7 +434,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
         default:
             msg_Err( p_sap, "Address family %d not supported by SAP",
                      addr.ss_family );
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             return VLC_EGENERIC;
     }
 
@@ -451,7 +447,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     if (p_sap_session->psz_data == NULL)
     {
         free (p_session->psz_sdp);
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         return VLC_ENOMEM;
     }
 
@@ -505,7 +501,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     msg_Dbg( p_sap,"%i addresses, %i sessions",
                    p_sap->i_addresses,p_sap->i_sessions);
 
-    vlc_mutex_unlock( &p_sap->object_lock );
+    vlc_object_unlock( p_sap );
 
     return VLC_SUCCESS;
 }
@@ -515,7 +511,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
                              session_descriptor_t *p_session )
 {
     int i;
-    vlc_mutex_lock( &p_sap->object_lock );
+    vlc_object_lock( p_sap );
 
     msg_Dbg( p_sap, "removing session %p from SAP", p_session);
 
@@ -542,7 +538,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
 
     msg_Dbg( p_sap,"%i announcements remaining", p_sap->i_sessions );
 
-    vlc_mutex_unlock( &p_sap->object_lock );
+    vlc_object_unlock( p_sap );
 
     return VLC_SUCCESS;
 }