Menu
▾
▴
[gst-cvs] thomasvs gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/gnomevfs/ gst-plugins-base/gst/audiorate/
|
From: <tho...@fr...> - 2005-07-08 10:59:53
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: thomasvs
Date: Fri Jul 08 2005 03:59:48 PDT
Log message:
* ext/gnomevfs/gstgnomevfs.c: (plugin_init):
* ext/gnomevfs/gstgnomevfssrc.c: (audiocast_init),
(audiocast_register_listener), (audiocast_thread_run),
(gst_gnomevfssrc_send_additional_headers_callback),
(gst_gnomevfssrc_received_headers_callback),
(gst_gnomevfssrc_push_callbacks), (gst_gnomevfssrc_pop_callbacks),
(gst_gnomevfssrc_get_icy_metadata), (gst_gnomevfssrc_create),
(gst_gnomevfssrc_get_size):
add/clean up debugging
* gst/audiorate/gstaudiorate.c: (gst_audiorate_init):
cleanups
Modified files:
. : ChangeLog
ext/gnomevfs : gstgnomevfs.c gstgnomevfssrc.c
gst/audiorate : gstaudiorate.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.1770&r2=1.1771
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfs.c.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c.diff?r1=1.70&r2=1.71
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/audiorate/gstaudiorate.c.diff?r1=1.6&r2=1.7
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -d -r1.1770 -r1.1771
--- ChangeLog 7 Jul 2005 14:01:04 -0000 1.1770
+++ ChangeLog 8 Jul 2005 10:59:36 -0000 1.1771
@@ -1,3 +1,17 @@
+2005-07-08 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * ext/gnomevfs/gstgnomevfs.c: (plugin_init):
+ * ext/gnomevfs/gstgnomevfssrc.c: (audiocast_init),
+ (audiocast_register_listener), (audiocast_thread_run),
+ (gst_gnomevfssrc_send_additional_headers_callback),
+ (gst_gnomevfssrc_received_headers_callback),
+ (gst_gnomevfssrc_push_callbacks), (gst_gnomevfssrc_pop_callbacks),
+ (gst_gnomevfssrc_get_icy_metadata), (gst_gnomevfssrc_create),
+ (gst_gnomevfssrc_get_size):
+ add/clean up debugging
+ * gst/audiorate/gstaudiorate.c: (gst_audiorate_init):
+ cleanups
2005-07-07 Andy Wingo <wi...@po...>
* sys/v4l/gstv4lsrc.c (gst_v4lsrc_fixate): Also fixate the
Index: gstgnomevfs.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstgnomevfs.c 31 Mar 2005 09:43:42 -0000 1.8
+++ gstgnomevfs.c 8 Jul 2005 10:59:36 -0000 1.9
@@ -29,16 +29,25 @@
#include <libgnomevfs/gnome-vfs.h>
#include <gst/gst.h>
+GST_DEBUG_CATEGORY_EXTERN (gnomevfssrc_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
gnome_vfs_init ();
- if (!gst_element_register (plugin, "gnomevfssrc", GST_RANK_SECONDARY, gst_gnomevfssrc_get_type ()) /*||
- !gst_element_register (plugin, "gnomevfssink",
- GST_RANK_SECONDARY, gst_gnomevfssink_get_type ()) */ ) {
+ GST_DEBUG_CATEGORY_INIT (gnomevfssrc_debug, "gnomevfssrc", 0,
+ "Gnome-VFS Source");
+ if (!gst_element_register (plugin, "gnomevfssrc", GST_RANK_SECONDARY,
+ gst_gnomevfssrc_get_type ()))
return FALSE;
- }
+/*
+ if (!gst_element_register (plugin, "gnomevfssink", GST_RANK_SECONDARY,
+ gst_gnomevfssink_get_type ()))
+ return FALSE;
+*/
#ifdef ENABLE_NLS
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -50,5 +59,5 @@
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"gnomevfs",
- "elements to access the Gnome vfs",
+ "elements to read from and write to Gnome-VFS uri's",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
Index: gstgnomevfssrc.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- gstgnomevfssrc.c 5 Jul 2005 16:43:02 -0000 1.70
+++ gstgnomevfssrc.c 8 Jul 2005 10:59:36 -0000 1.71
@@ -55,6 +55,9 @@
/* gnome-vfs.h doesn't include the following header, which we need: */
#include <libgnomevfs/gnome-vfs-standard-callbacks.h>
+GST_DEBUG_CATEGORY (gnomevfssrc_debug);
+#define GST_CAT_DEFAULT gnomevfssrc_debug
#define GST_TYPE_GNOMEVFSSRC \
(gst_gnomevfssrc_get_type())
#define GST_GNOMEVFSSRC(obj) \
@@ -529,7 +532,7 @@
if (!src->iradio_mode)
return TRUE;
- GST_DEBUG ("audiocast: registering listener");
+ GST_DEBUG_OBJECT (src, "audiocast: registering listener");
if (audiocast_register_listener (&src->audiocast_port,
&src->audiocast_fd) < 0) {
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL),
@@ -537,7 +540,7 @@
close (src->audiocast_fd);
}
- GST_DEBUG ("audiocast: creating pipe");
+ GST_DEBUG_OBJECT (src, "audiocast: creating pipe");
src->audiocast_notify_queue = NULL;
if (pipe (pipefds) < 0) {
@@ -545,7 +548,7 @@
src->audiocast_thread_die_infd = pipefds[0];
src->audiocast_thread_die_outfd = pipefds[1];
- GST_DEBUG ("audiocast: creating audiocast thread");
+ GST_DEBUG_OBJECT (src, "audiocast: creating audiocast thread");
src->audiocast_thread =
g_thread_create ((GThreadFunc) audiocast_thread_run, src, TRUE, &error);
if (error != NULL) {
@@ -564,7 +567,7 @@
int sock;
socklen_t sinlen = sizeof (struct sockaddr_in);
- GST_DEBUG ("audiocast: estabilishing UDP listener");
+ GST_DEBUG ("audiocast: establishing UDP listener");
if ((sock = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
goto lose;
@@ -686,7 +689,7 @@
g_mutex_lock (src->audiocast_queue_mutex);
src->audiocast_notify_queue =
g_list_append (src->audiocast_notify_queue, "iradio-title");
- GST_DEBUG ("audiocast title: %s\n", src->iradio_title);
+ GST_DEBUG_OBJECT (src, "audiocast title: %s\n", src->iradio_title);
g_mutex_unlock (src->audiocast_queue_mutex);
} else if (!strncmp (lines[i], "x-audiocast-streamurl", 21)) {
g_mutex_lock (src->audiocast_udpdata_mutex);
@@ -697,7 +700,7 @@
g_list_append (src->audiocast_notify_queue, "iradio-url");
- GST_DEBUG ("audiocast url: %s\n", src->iradio_title);
+ GST_DEBUG_OBJECT (src, "audiocast url: %s\n", src->iradio_title);
} else if (!strncmp (lines[i], "x-audiocast-udpseqnr", 20)) {
gchar outbuf[120];
@@ -711,7 +714,7 @@
strerror (errno));
continue;
}
- GST_DEBUG ("sent audiocast ack: %s\n", outbuf);
+ GST_DEBUG_OBJECT (src, "sent audiocast ack: %s\n", outbuf);
}
}
g_strfreev (lines);
@@ -751,7 +754,7 @@
return;
- GST_DEBUG ("sending headers\n");
+ GST_DEBUG_OBJECT (src, "sending headers\n");
out_args->headers = g_list_append (out_args->headers,
g_strdup ("icy-metadata:1\r\n"));
@@ -790,7 +793,7 @@
if (strncmp (data, "icy-metaint:", 12) == 0) { /* ugh */
if (sscanf (data + 12, "%d", &icy_metaint) == 1) {
src->icy_metaint = icy_metaint;
- GST_DEBUG ("got icy-metaint %d, killing audiocast thread",
+ GST_DEBUG_OBJECT (src, "got icy-metaint %d, killing audiocast thread",
src->icy_metaint);
audiocast_thread_kill (src);
continue;
@@ -804,7 +807,7 @@
else
continue;
- GST_DEBUG ("key: %s", key);
+ GST_DEBUG_OBJECT (src, "key: %s", key);
if (!strncmp (key, "name", 4)) {
g_free (src->iradio_name);
src->iradio_name = gst_gnomevfssrc_unicodify (value);
@@ -825,29 +828,29 @@
}
static void
-gst_gnomevfssrc_push_callbacks (GstGnomeVFSSrc * gnomevfssrc)
+gst_gnomevfssrc_push_callbacks (GstGnomeVFSSrc * src)
- if (gnomevfssrc->http_callbacks_pushed)
+ if (src->http_callbacks_pushed)
- GST_DEBUG ("pushing callbacks");
+ GST_DEBUG_OBJECT (src, "pushing callbacks");
gnome_vfs_module_callback_push
(GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS,
- gst_gnomevfssrc_send_additional_headers_callback, gnomevfssrc, NULL);
+ gst_gnomevfssrc_send_additional_headers_callback, src, NULL);
(GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS,
- gst_gnomevfssrc_received_headers_callback, gnomevfssrc, NULL);
+ gst_gnomevfssrc_received_headers_callback, src, NULL);
- gnomevfssrc->http_callbacks_pushed = TRUE;
+ src->http_callbacks_pushed = TRUE;
-gst_gnomevfssrc_pop_callbacks (GstGnomeVFSSrc * gnomevfssrc)
+gst_gnomevfssrc_pop_callbacks (GstGnomeVFSSrc * src)
- if (!gnomevfssrc->http_callbacks_pushed)
+ if (!src->http_callbacks_pushed)
- GST_DEBUG ("popping callbacks");
+ GST_DEBUG_OBJECT (src, "popping callbacks");
gnome_vfs_module_callback_pop
(GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS);
@@ -866,7 +869,7 @@
gchar **tags;
int i;
- GST_DEBUG ("reading icecast metadata");
+ GST_DEBUG_OBJECT (src, "reading icecast metadata");
while (length == 0) {
res = gnome_vfs_read (src->handle, &foobyte, 1, &length);
@@ -902,7 +905,7 @@
g_free (src->iradio_title);
src->iradio_title = gst_gnomevfssrc_unicodify (tags[i] + 13);
if (src->iradio_title) {
- GST_DEBUG ("sending notification on icecast title");
+ GST_DEBUG_OBJECT (src, "sending notification on icecast title");
g_object_notify (G_OBJECT (src), "iradio-title");
} else
g_print ("Unable to convert icecast title \"%s\" to UTF-8!\n",
@@ -913,7 +916,7 @@
g_free (src->iradio_url);
src->iradio_url = gst_gnomevfssrc_unicodify (tags[i] + 11);
if (src->iradio_url) {
- GST_DEBUG ("sending notification on icecast url");
+ GST_DEBUG_OBJECT (src, "sending notification on icecast url");
g_object_notify (G_OBJECT (src), "iradio-url");
g_print ("Unable to convert icecast url \"%s\" to UTF-8!\n",
@@ -969,7 +972,8 @@
data = GST_BUFFER_DATA (buf);
/* try to read */
- GST_DEBUG ("doing read: icy_count: %" G_GINT64_FORMAT, src->icy_count);
+ GST_DEBUG_OBJECT (src, "doing read: icy_count: %" G_GINT64_FORMAT,
+ src->icy_count);
res = gnome_vfs_read (src->handle, data,
src->icy_metaint - src->icy_count, &readbytes);
@@ -1045,7 +1049,7 @@
src = GST_GNOMEVFSSRC (basesrc);
- GST_DEBUG ("size %lld", src->size);
+ GST_DEBUG_OBJECT (src, "size %" G_GUINT64_FORMAT, src->size);
if (src->size == (GnomeVFSFileSize) - 1)
Index: gstaudiorate.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/audiorate/gstaudiorate.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gstaudiorate.c 6 May 2005 03:32:51 -0000 1.6
+++ gstaudiorate.c 8 Jul 2005 10:59:36 -0000 1.7
@@ -218,7 +218,6 @@
gst_audiorate_init (GstAudiorate * audiorate)
- GST_DEBUG ("gst_audiorate_init");
audiorate->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get
(&gst_audiorate_sink_template), "sink");
|