diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-09 16:36:30 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-09 16:36:30 +0000 |
| commit | dbdc8052d361e701772a18e3fc39576798e41bee (patch) | |
| tree | 37e09550c407cae73705d9ef835c46e4e72b9695 | |
| parent | 0e352e0cead02f8e1ab008525cd3f660b302bda0 (diff) | |
| download | gstreamer-plugins-base-dbdc8052d361e701772a18e3fc39576798e41bee.tar.gz | |
add/fix error handling in cdparanoia add it to translations make tools scripts executable
Original commit message from CVS:
add/fix error handling in cdparanoia
add it to translations
make tools scripts executable
| -rw-r--r-- | ChangeLog | 10 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/cdparanoia/gstcdparanoia.c | 16 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
5 files changed, 27 insertions, 5 deletions
@@ -1,5 +1,15 @@ 2004-03-09 Thomas Vander Stichele <thomas at apestaart dot org> + * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_base_init), + (cdparanoia_open), (cdparanoia_event): + fix/add error handling + * po/POTFILES.in: + add cdparanoia source + * tools/Makefile.am: + make scripts executable + +2004-03-09 Thomas Vander Stichele <thomas at apestaart dot org> + * configure.ac: * ext/vorbis/Makefile.am: * sys/Makefile.am: diff --git a/common b/common -Subproject 4eb02711e49a6aadf900d6fd9d220c17115fec2 +Subproject 5557aa074c4836b2cc9eac0e1519323df1cb876 diff --git a/ext/cdparanoia/gstcdparanoia.c b/ext/cdparanoia/gstcdparanoia.c index 9887f46b2..bfe2f7527 100644 --- a/ext/cdparanoia/gstcdparanoia.c +++ b/ext/cdparanoia/gstcdparanoia.c @@ -35,6 +35,7 @@ #include <sys/types.h> #include <dirent.h> #include <errno.h> +#include "gst/gst-i18n-plugin.h" /* taken from linux/cdrom.h */ #define CD_MSF_OFFSET 150 /* MSF numbering offset of first frame */ @@ -205,6 +206,7 @@ cdparanoia_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&cdparanoia_src_template)); gst_element_class_set_details (element_class, &cdparanoia_details); + } static void @@ -632,7 +634,9 @@ cdparanoia_open (CDParanoia *src) /* fail if the device couldn't be found */ if (src->d == NULL) { - GST_DEBUG ("couldn't open device"); + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, + (_("Could not open CD device for reading")), + ("cdda_identify failed")); return FALSE; } @@ -647,7 +651,9 @@ cdparanoia_open (CDParanoia *src) /* open the disc */ if (cdda_open (src->d)) { - GST_DEBUG ("couldn't open disc"); + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, + (_("Could not open CD device for reading")), + ("cdda_open failed")); cdda_close (src->d); src->d = NULL; return FALSE; @@ -686,7 +692,7 @@ cdparanoia_open (CDParanoia *src) /* create the paranoia struct and set it up */ src->p = paranoia_init (src->d); if (src->p == NULL) { - GST_DEBUG ("couldn't create paranoia struct"); + GST_ELEMENT_ERROR (src, LIBRARY, INIT, (NULL), (NULL)); return FALSE; } @@ -800,9 +806,9 @@ cdparanoia_event (GstPad *pad, GstEvent *event) src = CDPARANOIA (gst_pad_get_parent (pad)); if (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN)) { - g_print ("Not open\n"); + GST_DEBUG ("device not open, cannot handle event"); goto error; - } + } switch (GST_EVENT_TYPE (event)) { case GST_EVENT_SEEK: diff --git a/po/POTFILES.in b/po/POTFILES.in index a595819c7..ede78f92b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ ext/audiofile/gstafsink.c ext/audiofile/gstafsrc.c +ext/cdparanoia/gstcdparanoia.c ext/gnomevfs/gstgnomevfssrc.c ext/gnomevfs/gstgnomevfssink.c ext/sndfile/gstsf.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 4ee883b5a..9f102b073 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,4 +2,9 @@ bin_SCRIPTS = gst-launch-ext gst-visualise man_MANS = gst-launch-ext.1 gst-visualise.1 +all: all-am chmod + EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) gst-launch-ext.in + +chmod: $(bin_SCRIPTS) + chmod +x $^ |