diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2004-10-20 16:48:57 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2004-10-20 16:48:57 +0000 |
| commit | 9898bfadb360a98dde26a4eeb30dad0bd86d876e (patch) | |
| tree | 73dcf332d163653acc559dfc578487120daea257 /ext | |
| parent | 48c0c3a450b2e531d12f9c6b4891249763a80071 (diff) | |
| download | gst-plugins-bad-9898bfadb360a98dde26a4eeb30dad0bd86d876e.tar.gz gst-plugins-bad-9898bfadb360a98dde26a4eeb30dad0bd86d876e.tar.bz2 gst-plugins-bad-9898bfadb360a98dde26a4eeb30dad0bd86d876e.zip | |
I lied, I am the One True Buildmaster
Original commit message from CVS:
I lied, I am the One True Buildmaster
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/cdaudio/gstcdaudio.c | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 14e96187..aaa9c6a8 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -34,6 +34,12 @@ else AUDIOFILE_DIR= endif +if USE_CDAUDIO +CDAUDIO_DIR=cdaudio +else +CDAUDIO_DIR= +endif + if USE_CDPARANOIA CDPARANOIA_DIR=cdparanoia else @@ -359,6 +365,7 @@ SUBDIRS=\ $(ARTS_DIR) \ $(ARTSC_DIR) \ $(AUDIOFILE_DIR) \ + $(CDAUDIO_DIR) \ $(CDPARANOIA_DIR) \ $(DIRAC_DIR) \ $(DIVX_DIR) \ @@ -418,6 +425,7 @@ DIST_SUBDIRS=\ arts \ artsd \ audiofile \ + cdaudio \ cdparanoia \ dirac \ divx \ diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c index c9c64f95..9bf7fddd 100644 --- a/ext/cdaudio/gstcdaudio.c +++ b/ext/cdaudio/gstcdaudio.c @@ -284,19 +284,17 @@ gst_cdaudio_get_property (GObject * object, guint prop_id, GValue * value, } static void -print_track_info (GstCDAudio * cdaudio) +debug_track_info (GstCDAudio * cdaudio) { gint i; - /* - for (i = 0; i < cdaudio->info.disc_total_tracks; i++) { - g_print ("%d %d %d %d:%02d\n", i, - cdaudio->info.disc_track[i].track_length.frames, - cdaudio->info.disc_track[i].track_pos.frames, - cdaudio->info.disc_track[i].track_length.minutes, - cdaudio->info.disc_track[i].track_length.seconds); - } - */ + for (i = 0; i < cdaudio->info.disc_total_tracks; i++) { + GST_DEBUG_OBJECT (cdaudio, "%d %d %d %d:%02d", i, + cdaudio->info.disc_track[i].track_length.frames, + cdaudio->info.disc_track[i].track_pos.frames, + cdaudio->info.disc_track[i].track_length.minutes, + cdaudio->info.disc_track[i].track_length.seconds); + } } static GstElementStateReturn @@ -321,7 +319,7 @@ gst_cdaudio_change_state (GstElement * element) if (cd_stat (cdaudio->cd_desc, &cdaudio->info) < 0) return GST_STATE_FAILURE; - print_track_info (cdaudio); + debug_track_info (cdaudio); cdaudio->discid = cddb_discid (cdaudio->cd_desc); g_object_notify (G_OBJECT (cdaudio), "discid"); |