Changeset 5236:0a8740e27666 in roaraudio for libroar

Timestamp:

11/12/11 16:42:21 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roar_set_vol() and roar_server_oinfo(), as well as roar_exit().

Location:

libroar

Files:

• ctl.c (modified) (3 diffs)
• vs.c (modified) (2 diffs)

libroar/ctl.c

@@ -57 +57 @@
 }
 
-int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s) {
- return roar_server_oinfo2(con, s, -1);
-}
-
-int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir) {
+int roar_server_oinfo  (struct roar_connection * con, struct roar_stream * s, int dir) {
  struct roar_message mes;
 
@@ -126 +122 @@
 }
 
-int roar_exit   (struct roar_connection * con) {
- return roar_terminate(con, 0);
-}
-
 int roar_terminate (struct roar_connection * con, int terminate) {
  struct roar_message mes;
@@ -232 +224 @@
 }
 
-int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels) {
- return roar_set_vol2(con, id, mixer, channels, ROAR_SET_VOL_ALL);
-}
-
-int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) {
+int roar_set_vol     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) {
  struct roar_message m;
  uint16_t * info = (uint16_t *) m.data;

libroar/vs.c

@@ -1151 +1151 @@
   mode = ROAR_SET_VOL_UNMAPPED;
 
- if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == 0 )
+ if ( roar_set_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == 0 )
   return 0;
 
@@ -1167 +1167 @@
  mode     = ROAR_SET_VOL_ALL;
 
- if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == -1 ) {
+ if ( roar_set_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == -1 ) {
   _seterrre();
   return -1;