namereg: select default sink by priority

[pulseaudio] / src / pulsecore / msgobject.c

diff --git a/src/pulsecore/msgobject.c b/src/pulsecore/msgobject.c
index 81417ea4687d84f834fcd01f0df08fd354088a9a..075a28c5984a81187d6753ee3e9c578d1fa84a94 100644 (file)
--- a/src/pulsecore/msgobject.c
+++ b/src/pulsecore/msgobject.c
@@ -6,7 +6,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio 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 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -26,22 +26,22 @@
 
 #include "msgobject.h"
 
 
 #include "msgobject.h"
 

-PA_DEFINE_CHECK_TYPE(pa_msgobject, pa_object);
+PA_DEFINE_PUBLIC_CLASS(pa_msgobject, pa_object);

 
 

-pa_msgobject *pa_msgobject_new_internal(size_t size, const char *type_name, int (*check_type)(const char *type_name)) {
+pa_msgobject *pa_msgobject_new_internal(size_t size, const char *type_id, pa_bool_t (*check_type)(const char *type_name)) {

     pa_msgobject *o;
 
     pa_assert(size > sizeof(pa_msgobject));
     pa_msgobject *o;
 
     pa_assert(size > sizeof(pa_msgobject));

-    pa_assert(type_name);
+    pa_assert(type_id);

 
     if (!check_type)
         check_type = pa_msgobject_check_type;
 
 
     if (!check_type)
         check_type = pa_msgobject_check_type;
 

-    pa_assert(check_type(type_name));
-    pa_assert(check_type("pa_object"));
-    pa_assert(check_type("pa_msgobject"));
+    pa_assert(check_type(type_id));
+    pa_assert(check_type(pa_object_type_id));
+    pa_assert(check_type(pa_msgobject_type_id));

 
 

-    o = PA_MSGOBJECT(pa_object_new_internal(size, type_name, check_type));
+    o = PA_MSGOBJECT(pa_object_new_internal(size, type_id, check_type));

     o->process_msg = NULL;
     return o;
 }
     o->process_msg = NULL;
     return o;
 }