diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-04-13 14:35:32 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-05-19 11:22:07 +0200 |
| commit | 6fdcb9310d8bd0383af97951ff7ba270c5ba08be (patch) | |
| tree | 8833a5c52dcdfcb264b6d55756f92cc90f824814 /server/reds.c | |
| parent | 4701a063da5c00b33bc9ccb264b042e046c97df9 (diff) | |
| download | spice-6fdcb9310d8bd0383af97951ff7ba270c5ba08be.tar.gz spice-6fdcb9310d8bd0383af97951ff7ba270c5ba08be.tar.xz spice-6fdcb9310d8bd0383af97951ff7ba270c5ba08be.zip | |
SoundInterfaces: redesign
Diffstat (limited to 'server/reds.c')
| -rw-r--r-- | server/reds.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/server/reds.c b/server/reds.c index d5a28c6a..a5e6c1bc 100644 --- a/server/reds.c +++ b/server/reds.c @@ -4126,23 +4126,23 @@ __visible__ int spice_server_add_interface(SpiceServer *s, reds->monitor_mode.y_res); } - } else if (strcmp(interface->type, VD_INTERFACE_PLAYBACK) == 0) { - red_printf("VD_INTERFACE_PLAYBACK"); - if (interface->major_version != VD_INTERFACE_PLAYBACK_MAJOR || - interface->minor_version < VD_INTERFACE_PLAYBACK_MINOR) { + } else if (strcmp(interface->type, SPICE_INTERFACE_PLAYBACK) == 0) { + red_printf("SPICE_INTERFACE_PLAYBACK"); + if (interface->major_version != SPICE_INTERFACE_PLAYBACK_MAJOR || + interface->minor_version < SPICE_INTERFACE_PLAYBACK_MINOR) { red_printf("unsuported playback interface"); return -1; } - snd_attach_playback((PlaybackInterface *)interface); + snd_attach_playback(SPICE_CONTAINEROF(sin, SpicePlaybackInstance, base)); - } else if (strcmp(interface->type, VD_INTERFACE_RECORD) == 0) { + } else if (strcmp(interface->type, SPICE_INTERFACE_RECORD) == 0) { red_printf("VD_INTERFACE_RECORD"); - if (interface->major_version != VD_INTERFACE_RECORD_MAJOR || - interface->minor_version < VD_INTERFACE_RECORD_MINOR) { + if (interface->major_version != SPICE_INTERFACE_RECORD_MAJOR || + interface->minor_version < SPICE_INTERFACE_RECORD_MINOR) { red_printf("unsuported record interface"); return -1; } - snd_attach_record((RecordInterface *)interface); + snd_attach_record(SPICE_CONTAINEROF(sin, SpiceRecordInstance, base)); } else if (strcmp(interface->type, VD_INTERFACE_VDI_PORT) == 0) { red_printf("VD_INTERFACE_VDI_PORT"); @@ -4191,13 +4191,13 @@ __visible__ int spice_server_remove_interface(SpiceBaseInstance *sin) reds_update_mouse_mode(); } - } else if (strcmp(interface->type, VD_INTERFACE_PLAYBACK) == 0) { - red_printf("remove VD_INTERFACE_PLAYBACK"); - snd_detach_playback((PlaybackInterface *)interface); + } else if (strcmp(interface->type, SPICE_INTERFACE_PLAYBACK) == 0) { + red_printf("remove SPICE_INTERFACE_PLAYBACK"); + snd_detach_playback(SPICE_CONTAINEROF(sin, SpicePlaybackInstance, base)); - } else if (strcmp(interface->type, VD_INTERFACE_RECORD) == 0) { - red_printf("remove VD_INTERFACE_RECORD"); - snd_detach_record((RecordInterface *)interface); + } else if (strcmp(interface->type, SPICE_INTERFACE_RECORD) == 0) { + red_printf("remove SPICE_INTERFACE_RECORD"); + snd_detach_record(SPICE_CONTAINEROF(sin, SpiceRecordInstance, base)); } else if (strcmp(interface->type, VD_INTERFACE_VDI_PORT) == 0) { red_printf("remove VD_INTERFACE_VDI_PORT"); |