Changeset 5235:f6772d7182e8 in roaraudio for plugins/gstreamer0.10

Timestamp:

11/12/11 16:33:39 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use newer API functions

Location:

plugins/gstreamer0.10

Files:

• roarmixer.c (modified) (4 diffs)
• roarsink.c (modified) (1 diff)

plugins/gstreamer0.10/roarmixer.c

@@ -285 +285 @@
  int channels;
  struct roar_mixer_settings m;
+ int mode = ROAR_SET_VOL_ALL;
  gint i;
 
@@ -296 +297 @@
 
  if ( channels != track->num_channels ) {
-  ROAR_WARN("gst_roarmixer_get_volume(*): numer of channels for stream %i mismatch", roartrack->stream_id);
+  ROAR_WARN("gst_roarmixer_get_volume(*): numer of channels for stream %i mismatch (local: %i, server: %i)",
+            roartrack->stream_id, (int)track->num_channels, channels);
 
   if ( track->num_channels < channels )
    channels = track->num_channels;
+  mode = ROAR_SET_VOL_UNMAPPED;
  }
 
@@ -308 +311 @@
  m.scale = 65535;
 
- roar_set_vol(&(mixer->con), roartrack->stream_id, &m, channels);
+ _LIBROAR_IGNORE_RET(roar_set_vol2(&(mixer->con), roartrack->stream_id, &m, channels, mode));
 }
 
@@ -360 +363 @@
 
   if (mute) {
-    roar_stream_set_flags(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_SET_FLAG);
+    _LIBROAR_IGNORE_RET(roar_stream_set_flags2(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_SET_FLAG));
   } else {
-    roar_stream_set_flags(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_RESET_FLAG);
+    _LIBROAR_IGNORE_RET(roar_stream_set_flags2(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_RESET_FLAG));
   }
 }

plugins/gstreamer0.10/roarsink.c

@@ -251 +251 @@
     goto couldnt_connect;
 
-  if ( roar_server_oinfo(roar_vs_connection_obj(roarsink->vss, NULL), &oinfo) == -1 )
+  if ( roar_server_oinfo2(roar_vs_connection_obj(roarsink->vss, NULL), &oinfo, ROAR_DIR_PLAY) == -1 )
     goto no_server_info;