ext/alsa/gstalsa.c: be sure to stop the clock when going to paused

Original commit message from CVS:
2004-02-05  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* ext/alsa/gstalsa.c: (gst_alsa_change_state):
be sure to stop the clock when going to paused
* sys/oss/gstosssink.c: (gst_osssink_change_state):
reset number of transmitted when going to ready.
fixes #132935

2004-02-05  Charles Schmidt <cschmidt2@emich.edu>

reviewed by Benjamin Otte

* ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list):
extract track count (fixes #133410)

diff --git a/ChangeLog b/ChangeLog
index 1c6f146..9e7a72d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-02-05  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+       * ext/alsa/gstalsa.c: (gst_alsa_change_state):
+         be sure to stop the clock when going to paused
+       * sys/oss/gstosssink.c: (gst_osssink_change_state):
+         reset number of transmitted when going to ready.
+       fixes #132935
+
+2004-02-05  Charles Schmidt <cschmidt2@emich.edu>
+
+       reviewed by Benjamin Otte
+
+       * ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list):
+         extract track count (fixes #133410)
+
 2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
        * ext/mad/gstid3tag.c: (gst_id3_tag_do_caps_nego):

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index d506e01..4e7fdae 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -481,16 +481,30 @@ gst_mad_id3_to_tag_list(const struct id3_tag *tag)
        {
          guint tmp;
          gchar *check;
+
          tmp = strtoul (utf8, &check, 10);
-         if (*check != '\0') break;
+
          if (strcmp (tag_name, GST_TAG_DATE) == 0) {
            GDate *d;
 
+           if (*check != '\0') break;
            if (tmp == 0) break;
            d = g_date_new_dmy (1, 1, tmp);
            tmp = g_date_get_julian (d);
            g_date_free (d);
+         } else if (strcmp(tag_name,GST_TAG_TRACK_NUMBER) == 0) {
+           if (*check == '/') {
+             guint total;
+
+             check++;
+             total = strtoul (check, &check, 10);
+             if (*check != '\0') break;
+
+             gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, GST_TAG_TRACK_COUNT, total, NULL);
+           }
          }
+
+         if (*check != '\0') break;            
          gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, tag_name, tmp, NULL);
          break;
        }