summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2010-03-21 10:42:39 +0000
committerphintuka <phintuka>2010-03-21 10:42:39 +0000
commit0bf9628c93a6ea36652abed99c1972fe9af2d1e6 (patch)
tree4cdfeb96faf30d0a0d12293f0033281296045544
parent6bcd680785dba940686cedd4a029062c4f64939f (diff)
downloadxineliboutput-0bf9628c93a6ea36652abed99c1972fe9af2d1e6.tar.gz
xineliboutput-0bf9628c93a6ea36652abed99c1972fe9af2d1e6.tar.bz2
xvdr_metronom_dispose(): use xvdr_metronom_unwire()
-rw-r--r--xine/xvdr_metronom.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/xine/xvdr_metronom.c b/xine/xvdr_metronom.c
index 34cc7683..d4246952 100644
--- a/xine/xvdr_metronom.c
+++ b/xine/xvdr_metronom.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xvdr_metronom.c,v 1.9 2010-03-21 10:26:47 phintuka Exp $
+ * $Id: xvdr_metronom.c,v 1.10 2010-03-21 10:42:39 phintuka Exp $
*
*/
@@ -149,14 +149,6 @@ static void xvdr_metronom_set_cb(xvdr_metronom_t *this,
this->frame_decoded = cb;
}
-static void xvdr_metronom_dispose(xvdr_metronom_t *this)
-{
- if (this->stream && this->orig_metronom)
- this->stream->metronom = this->orig_metronom;
-
- free(this);
-}
-
static void xvdr_metronom_reset_frames(xvdr_metronom_t *this)
{
this->video_frames = this->audio_frames = 0;
@@ -202,6 +194,12 @@ static void xvdr_metronom_unwire(xvdr_metronom_t *this)
}
}
+static void xvdr_metronom_dispose(xvdr_metronom_t *this)
+{
+ xvdr_metronom_unwire(this);
+
+ free(this);
+}
/*
* init