[xiph-commits] r18117 - trunk/ao/src/plugins/roar

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2011-11-19 12:01:16 -0800 (Sat, 19 Nov 2011)
New Revision: 18117

Modified:
   trunk/ao/src/plugins/roar/ao_roar.c
Log:
Commit patch to Roar driver provided by ph3-der-loewe
See Trac #1786



Modified: trunk/ao/src/plugins/roar/ao_roar.c
===================================================================
--- trunk/ao/src/plugins/roar/ao_roar.c	2011-11-06 14:36:14 UTC (rev 18116)
+++ trunk/ao/src/plugins/roar/ao_roar.c	2011-11-19 20:01:16 UTC (rev 18117)
@@ -90,12 +90,17 @@
 int ao_plugin_test(void) {
   struct roar_connection con;
 
+#ifdef ROAR_FT_FUNC_SIMPLE_CONNECT2
+  if ( roar_simple_connect2(&con, NULL, DEFAULT_CLIENT_NAME, ROAR_ENUM_FLAG_NONBLOCK, 0) == -1 )
+    return 0;
+#else
   disable_slp();
   if ( roar_simple_connect(&con, NULL, DEFAULT_CLIENT_NAME) == -1 ) {
     reenable_slp();
     return 0;
   }
   reenable_slp();
+#endif
 
   if (roar_get_standby(&con)) {
     roar_disconnect(&con);
@@ -191,6 +196,10 @@
   if ( internal->con_opened )
     return 1;
 
+#ifdef ROAR_FT_FUNC_SIMPLE_CONNECT2
+  if ( roar_simple_connect2(&(internal->con), internal->host, internal->client_name, ROAR_ENUM_FLAG_NONBLOCK, 0) == -1 )
+   return 0;
+#else
   if ( internal->host == NULL )
     disable_slp();
   if ( roar_simple_connect(&(internal->con), internal->host, internal->client_name) == -1 ) {
@@ -200,6 +209,7 @@
   }
   if ( internal->host == NULL )
     reenable_slp();
+#endif
 
   internal->con_opened = 1;