summaryrefslogtreecommitdiffstats
path: root/server/snd_worker.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-03-09 11:10:00 +0100
committerAlexander Larsson <alexl@redhat.com>2010-03-09 11:10:00 +0100
commit90c5766caf16e35cb871116a4655a106a3c272dc (patch)
treeddc2ea976240a3f8f9c3294b41492256e6eb3f82 /server/snd_worker.c
parent5cb99e12c6817592f49ca153a3081dd6b5995cf2 (diff)
downloadspice-90c5766caf16e35cb871116a4655a106a3c272dc.tar.gz
spice-90c5766caf16e35cb871116a4655a106a3c272dc.tar.xz
spice-90c5766caf16e35cb871116a4655a106a3c272dc.zip
Use macros from <spice/macros.h> rather than duplicate them
Diffstat (limited to 'server/snd_worker.c')
-rw-r--r--server/snd_worker.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/server/snd_worker.c b/server/snd_worker.c
index 3046bd1b..d9e5b625 100644
--- a/server/snd_worker.c
+++ b/server/snd_worker.c
@@ -842,7 +842,7 @@ static void snd_set_command(SndChannel *channel, uint32_t command)
static void snd_playback_start(PlaybackPlug *plug)
{
- PlaybackChannel *playback_channel = CONTAINEROF(plug, PlaybackChannel, plug);
+ PlaybackChannel *playback_channel = SPICE_CONTAINEROF(plug, PlaybackChannel, plug);
ASSERT(!playback_channel->base.active);
reds_desable_mm_timer();
@@ -857,7 +857,7 @@ static void snd_playback_start(PlaybackPlug *plug)
static void snd_playback_stop(PlaybackPlug *plug)
{
- PlaybackChannel *playback_channel = CONTAINEROF(plug, PlaybackChannel, plug);
+ PlaybackChannel *playback_channel = SPICE_CONTAINEROF(plug, PlaybackChannel, plug);
ASSERT(playback_channel->base.active);
reds_enable_mm_timer();
@@ -880,7 +880,7 @@ static void snd_playback_stop(PlaybackPlug *plug)
static void snd_playback_get_frame(PlaybackPlug *plug, uint32_t **frame, uint32_t *num_samples)
{
- PlaybackChannel *playback_channel = CONTAINEROF(plug, PlaybackChannel, plug);
+ PlaybackChannel *playback_channel = SPICE_CONTAINEROF(plug, PlaybackChannel, plug);
ASSERT(playback_channel->base.active);
if (!playback_channel->free_frames) {
@@ -896,7 +896,7 @@ static void snd_playback_get_frame(PlaybackPlug *plug, uint32_t **frame, uint32_
static void snd_playback_put_frame(PlaybackPlug *plug, uint32_t *samples)
{
- PlaybackChannel *playback_channel = CONTAINEROF(plug, PlaybackChannel, plug);
+ PlaybackChannel *playback_channel = SPICE_CONTAINEROF(plug, PlaybackChannel, plug);
AudioFrame *frame;
ASSERT(playback_channel->base.active);
@@ -904,7 +904,7 @@ static void snd_playback_put_frame(PlaybackPlug *plug, uint32_t *samples)
if (playback_channel->pending_frame) {
snd_playback_free_frame(playback_channel, playback_channel->pending_frame);
}
- frame = CONTAINEROF(samples, AudioFrame, samples);
+ frame = SPICE_CONTAINEROF(samples, AudioFrame, samples);
frame->time = reds_get_mm_time();
red_dispatcher_set_mm_time(frame->time);
playback_channel->pending_frame = frame;
@@ -1015,7 +1015,7 @@ static void snd_record_migrate(Channel *channel)
static void snd_record_start(RecordPlug *plug)
{
- RecordChannel *record_channel = CONTAINEROF(plug, RecordChannel, plug);
+ RecordChannel *record_channel = SPICE_CONTAINEROF(plug, RecordChannel, plug);
ASSERT(!record_channel->base.active);
record_channel->base.active = TRUE;
@@ -1031,7 +1031,7 @@ static void snd_record_start(RecordPlug *plug)
static void snd_record_stop(RecordPlug *plug)
{
- RecordChannel *record_channel = CONTAINEROF(plug, RecordChannel, plug);
+ RecordChannel *record_channel = SPICE_CONTAINEROF(plug, RecordChannel, plug);
ASSERT(record_channel->base.active);
record_channel->base.active = FALSE;
@@ -1045,7 +1045,7 @@ static void snd_record_stop(RecordPlug *plug)
static uint32_t snd_record_read(RecordPlug *plug, uint32_t num_samples, uint32_t *samples)
{
- RecordChannel *record_channel = CONTAINEROF(plug, RecordChannel, plug);
+ RecordChannel *record_channel = SPICE_CONTAINEROF(plug, RecordChannel, plug);
uint32_t read_pos;
uint32_t now;
uint32_t len;