aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-01-10 20:46:04 +0100
committerMax Kellermann <max@duempel.org>2011-01-10 20:46:04 +0100
commitb77e62260aa1f3d36d742d947610c13f235bb67a (patch)
tree9be88302670f1913027595215552eafc83bac4d9 /src/decoder_control.c
parentb6995ca0113611613d311250eabfc354658d46a7 (diff)
downloadmpd-b77e62260aa1f3d36d742d947610c13f235bb67a.tar.gz
mpd-b77e62260aa1f3d36d742d947610c13f235bb67a.tar.xz
mpd-b77e62260aa1f3d36d742d947610c13f235bb67a.zip
decoder_control: replace dc_init() with dc_new()
dc_new() allocates the object and returns it. dc_free() frees it (replaces dc_deinit()).
Diffstat (limited to '')
-rw-r--r--src/decoder_control.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/decoder_control.c b/src/decoder_control.c
index 6cc2849c5..2ad7dbef9 100644
--- a/src/decoder_control.c
+++ b/src/decoder_control.c
@@ -27,9 +27,11 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "decoder_control"
-void
-dc_init(struct decoder_control *dc, struct player_control *pc)
+struct decoder_control *
+dc_new(struct player_control *pc)
{
+ struct decoder_control *dc = g_new(struct decoder_control, 1);
+
dc->player_control = pc;
dc->thread = NULL;
@@ -44,19 +46,19 @@ dc_init(struct decoder_control *dc, struct player_control *pc)
dc->mixramp_start = NULL;
dc->mixramp_end = NULL;
dc->mixramp_prev_end = NULL;
+
+ return dc;
}
void
-dc_deinit(struct decoder_control *dc)
+dc_free(struct decoder_control *dc)
{
g_cond_free(dc->cond);
g_mutex_free(dc->mutex);
g_free(dc->mixramp_start);
g_free(dc->mixramp_end);
g_free(dc->mixramp_prev_end);
- dc->mixramp_start = NULL;
- dc->mixramp_end = NULL;
- dc->mixramp_prev_end = NULL;
+ g_free(dc);
}
static void