Changeset 113

Timestamp:

09/07/06 15:59:34 (5 years ago)

Author:

ath

Message:

Improve FmInputGst and fix the previous commit.

Location:

fm_server/trunk/src

Files:

• fm_input_cdj.c (modified) (2 diffs)
• fm_input_gst/fm_input_gst.c (modified) (7 diffs)
• fm_input_gst/gstfmsink.c (modified) (2 diffs)
• src_type_conv.c (added)
• src_type_conv.h (added)

fm_server/trunk/src/fm_input_cdj.c

@@ -18 +18 @@
 
 #include <rgc_server.h>
-/*#ifdef G_OS_WIN32
-#include <windows.h>
-#endif*/
 
 #include <unistd.h>
@@ -236 +233 @@
         rgc_signal_change_owner (input_cdj->input, input_cdj, "tick");
         rgc_signal_change_owner (input_cdj->input, input_cdj, "ready");
+        rgc_signal_change_owner (input_cdj->input, input_cdj, "found_tag");
         
         return TRUE;    

fm_server/trunk/src/fm_input_gst/fm_input_gst.c

@@ -188 +188 @@
 reset_status                            (FmInputGst     *input_gst)
 {
+        g_print ("RESET STATUS!\n");
         input_gst->current_pos_samples = 0;
-//      input_gst->bytes_behind_us = 0;
         input_gst->seek_at_sample = -1;
+
+        if (input_gst->common)
+                input_gst->common->gst_seek_to_sample = -1;
 }
 
@@ -419 +422 @@
 }
 
+void
+fm_input_gst_state_changed              (void)
+{
+        
+
+}
+
 
 gboolean
@@ -432 +442 @@
         FmInputGstCommon *common = input_gst->common;
         FmChunk *chk = common->read_chunk;
-        //g_print ("tick!\n");
+
+        if (!chk)
+                return;
 
         GValue *pos_val = g_value_init_int64 (input_gst->current_pos_samples * common->nsec_for_sample);
@@ -682 +694 @@
         GValue *tag_name;
 
-        gint count = gst_tag_list_get_tag_size (list, tag);
-        g_return_if_fail (count == 1);
-
-        G_CONST_RETURN GValue *val = gst_tag_list_get_value_index (list, tag, 0);
+        gint i;
+        for (i = 0; i < gst_tag_list_get_tag_size (list, tag); i++) {
+
+                G_CONST_RETURN GValue *val = gst_tag_list_get_value_index (list, tag, i);
         
-        if (strcmp (tag, GST_TAG_ARTIST) == 0) {
-                tag_name = g_value_init_string ("artist");
-        } else if (strcmp (tag, GST_TAG_TITLE) == 0) {
-                tag_name = g_value_init_string ("artist");
-        } else
-                return;
-        
-        rgc_signal_emit (input_gst, "found_tag", tag_name, val, NULL);
-        g_value_destroy (tag_name);
+                if (strcmp (tag, GST_TAG_ARTIST) == 0) {
+                        tag_name = g_value_init_string ("artist");
+                } else if (strcmp (tag, GST_TAG_TITLE) == 0) {
+                        tag_name = g_value_init_string ("title");
+                } else {
+                        g_print ("ignoring tag \"%s\"\n", tag);
+                        continue;
+                }
+
+                rgc_signal_emit (input_gst, "found_tag", tag_name, val, NULL);
+                g_value_destroy (tag_name);
+        }
 }
 
@@ -704 +719 @@
                                          gpointer       data)
 {
-        FmInputGst *input_gst = FM_INPUT_GST(data);
-
-        g_print ("Got %s message\n", GST_MESSAGE_TYPE_NAME (message));
+        FmInputGst *input_gst = FM_INPUT_GST (data);
+        FmInput *input = FM_INPUT (data);
+
+        //g_print ("Got %s message\n", GST_MESSAGE_TYPE_NAME (message));
 
         switch (GST_MESSAGE_TYPE (message)) {
@@ -718 +734 @@
                         g_free (debug);
 
-                        //g_main_loop_quit (loop);
+                        input_gst->play_when_ready = FALSE;                     
+                        input->state = FM_INPUT_STOP;
+                        fm_input_state_changed (input);
+
                         break;
                 }
@@ -731 +750 @@
                         break;
                 }
+
+                case GST_MESSAGE_STATE_CHANGED: {
+                        GstState oldstate, newstate, pending;
+                        gst_message_parse_state_changed (message, &oldstate, &newstate, &pending);
+                        g_print ("state changed: old %d, new %d, pending %d\n", oldstate, newstate, pending);
+                        break;
+                }
+
                 default:
+                        g_print ("Got %s message\n", GST_MESSAGE_TYPE_NAME (message));
                         /* unhandled message */
                 break;

fm_server/trunk/src/fm_input_gst/gstfmsink.c

@@ -245 +245 @@
 
   switch (GST_EVENT_TYPE (event)) {
+
     case GST_EVENT_EOS:
     {
@@ -250 +251 @@
         common->write_chunk->eos_offset_samples = sink->offset_samples;
         g_print("   got EOS at offset %lld\n", common->write_chunk->eos_offset_samples);
-        //
+        sink->seek_in_progress = FALSE;
+        sink->seek_target = -1; 
 
       break;