Changeset 459:cd25fa92d002 in roaraudio


Ignore:
Timestamp:
08/12/08 06:16:38 (16 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added mixer support

File:
1 edited

Legend:

Unmodified
Added
Removed
  • plugins/xmms/roar.c

    r458 r459  
    2323 
    2424void roar_get_volume(int *l, int *r); 
    25 void roar_fetch_volume(int *l, int *r); 
    2625void roar_set_volume(int l, int r); 
    2726void roar_mixer_init(void); 
     
    4847        roar_about, 
    4948        NULL, //roar_configure, 
    50         NULL, //roar_get_volume, 
    51         NULL, //roar_set_volume, 
     49        roar_get_volume, 
     50        roar_set_volume, 
    5251        roar_open, 
    5352        roar_write, 
     
    301300} 
    302301 
     302// MIXER: 
     303 
     304void roar_get_volume(int *l, int *r) { 
     305 int channels; 
     306 struct roar_mixer_settings mixer; 
     307 
     308 if ( !(g_inst.state & STATE_CONNECTED) ) 
     309  return; 
     310 
     311 if ( roar_get_vol(&(g_inst.con), g_inst.stream.id, &mixer, &channels) == -1 ) { 
     312  *l = *r = 100; 
     313  return; 
     314 } 
     315 
     316 if ( channels == 1 ) { 
     317  *l = *r = mixer.mixer[0]/655.35; 
     318 } else { 
     319  *l = mixer.mixer[0]/655.35; 
     320  *r = mixer.mixer[1]/655.35; 
     321 } 
     322} 
     323 
     324void roar_set_volume(int l, int r) { 
     325 struct roar_mixer_settings mixer; 
     326 
     327 if ( !(g_inst.state & STATE_CONNECTED) ) 
     328  return; 
     329 
     330 mixer.mixer[0] = l * 655.35; 
     331 mixer.mixer[1] = r * 655.35; 
     332 
     333 roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2); 
     334} 
     335 
    303336//ll 
Note: See TracChangeset for help on using the changeset viewer.