Changeset 229 for trunk

Timestamp:

02/15/08 00:52:50 (4 years ago)

Author:

ath

Message:

Fix some old-standing memory-handling bugs in FmOutputAlsa and FmInputTest?.

Location:

trunk/fm_server/src

Files:

• fm_buffer.c (modified) (1 diff)
• fm_element.c (modified) (5 diffs)
• fm_element.h (modified) (1 diff)
• fm_input.c (modified) (3 diffs)
• fm_input_test.c (modified) (2 diffs)
• fm_output.c (modified) (2 diffs)
• fm_output.h (modified) (1 diff)
• fm_output_alsa.c (modified) (16 diffs)
• fm_pipeline.c (modified) (4 diffs)
• fm_pipeline.h (modified) (1 diff)

trunk/fm_server/src/fm_buffer.c

@@ -41 +41 @@
 
         size_bytes = samples_to_bytes(n_samples, n_channels);
-        g_print ("Allocated a new buffer of %d bytes\n", size_bytes);
+        g_print ("Allocated a new buffer of %d samples, %d bytes\n", n_samples, size_bytes);
 
         

trunk/fm_server/src/fm_element.c

@@ -207 +207 @@
         g_return_if_fail (FM_IS_ELEMENT (element));
         g_return_if_fail (name);
-        
+
         element->name = g_strdup (name);
 }
@@ -217 +217 @@
         g_return_val_if_fail (FM_IS_ELEMENT (element), NULL);
         
-        return (element->name);
+        return (gchar *) g_object_get_data (G_OBJECT (element), "name");
+        //return (element->name);
 }
 
@@ -282 +283 @@
         FmElementClass *klass = FM_ELEMENT_GET_CLASS (element);
 
-//      g_print("fm_element_activate, %p\n", element);
-
-        g_return_val_if_fail (!element->active, FALSE);
+        g_print("fm_element_activate, %p - %s\n", element, fm_element_get_name (element));
+
+        if (element->active) {
+                g_warning ("Element \"%s\" was active!", fm_element_get_name (element));
+                return FALSE;
+        }
 
         if (!element->pipeline) {
@@ -312 +316 @@
         g_return_val_if_fail (FM_IS_ELEMENT (element), FALSE);
         FmElementClass *class = FM_ELEMENT_GET_CLASS (element);
-        
-        g_return_val_if_fail (element->active, FALSE);
+
+        g_print("fm_element_deactivate, %p - %s\n", element, fm_element_get_name (element));
+        
+        if (!element->active) {
+                g_warning ("Element \"%s\" was not active!", fm_element_get_name (element));
+                return FALSE;
+        }
         
         gboolean ret;   
@@ -390 +399 @@
 
 
+gboolean
+fm_element_deactivate_connected         (FmElement      *element)
+{
+        g_return_val_if_fail (element->sink_ports, FALSE);
+
+//      g_print("fm_element_activate_connected, %p\n", element);
+
+        GList *tmp = element->sink_ports;
+        while (tmp) {
+                FmElementSinkPort *our_port = (FmElementSinkPort *) tmp->data;
+                FmElementSrcPort *peer_port = our_port->peer;
+
+                if (peer_port == NULL)
+                        return TRUE;
+
+                if (!fm_element_deactivate (FM_ELEMENT (peer_port->owner)))
+                        return FALSE;
+                tmp = tmp->next;
+        }
+
+        return TRUE;
+}
+
+
 void
 fm_element_get_buffer_from_src          (FmElement      *element,

trunk/fm_server/src/fm_element.h

@@ -167 +167 @@
 fm_element_activate_connected           (FmElement      *element);
 
+gboolean
+fm_element_deactivate_connected         (FmElement      *element);
+
 void
 fm_element_get_buffer_from_src          (FmElement      *element,

trunk/fm_server/src/fm_input.c

@@ -95 +95 @@
 fm_input_class_init                     (FmInputClass   *class)
 {
-        GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+        //GObjectClass *gobject_class = G_OBJECT_CLASS (class);
         //FmElementClass *element_class = FM_ELEMENT_CLASS (class);
         FmInputClass *input_class = FM_INPUT_CLASS (class);
@@ -106 +106 @@
         input_class->set_position = NULL;
         
-        g_object_class_install_property (gobject_class,
+/*        g_object_class_install_property (gobject_class,
                                          PROP_STATE,
                                          g_param_spec_int ("state",
@@ -112 +112 @@
                                          "Input state",
                                          FM_INPUT_STOP, FM_INPUT_PLAY, FM_INPUT_PLAY,
-                                         G_PARAM_READWRITE));
+                                         G_PARAM_READWRITE));*/
 }
 

trunk/fm_server/src/fm_input_test.c

@@ -207 +207 @@
         FmInputTest *input_test = FM_INPUT_TEST (object);
         g_return_if_fail (FM_IS_INPUT_TEST (input_test));
-        /* Nothing to do here */
+        
+        G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -216 +217 @@
         FmInputTest *input_test = FM_INPUT_TEST (object);
         g_return_if_fail (FM_IS_INPUT_TEST (input_test));
-        g_free (input_test);
-        
-        g_print ("aaaaaaaaalllllllllrrrrrrriiiiggggghhhhhhhhtttttttt!!!!!!!\n");
+        
+        G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 

trunk/fm_server/src/fm_output.c

@@ -105 +105 @@
 
 
-/*guint
-fm_output_get_max_buffer_size           (FmOutput       *output)
-{
-        return 0;
-}*/
-
-
 gboolean
 fm_output_start                         (FmOutput       *output)
@@ -125 +118 @@
         }
 }
+
 
 gboolean

trunk/fm_server/src/fm_output.h

@@ -53 +53 @@
         FmElementClass parent;
 
-        /*guint (*get_max_buffer_size)  (FmOutput       *output);*/
+        /* Let the output element start and allow it to call get_buffer() on its connected elements.
+           It will be called after activate() */
         gboolean (*start)               (FmOutput       *output);
+
+        /* Signal the output element to stop (it isn't allowed to call get_buffer() again. */
         gboolean (*stop)                (FmOutput       *output);
 };

trunk/fm_server/src/fm_output_alsa.c

@@ -75 +75 @@
 static gboolean fm_output_alsa_activate (FmElement      *element);
 static gboolean fm_output_alsa_deactivate (FmElement    *element);
+static void fm_output_alsa_dispose      (GObject        *object);
 static void fm_output_alsa_finalize     (GObject        *object);
 static gint xrun_recovery               (snd_pcm_t      *handle,
@@ -80 +81 @@
 static gpointer fm_output_alsa_play     (gpointer       data);
 static gboolean fm_output_alsa_start    (FmOutput       *output);
+static gboolean fm_output_alsa_stop     (FmOutput       *output);
                                  
 
@@ -129 +131 @@
         gobject_class->set_property = fm_output_alsa_set_property;
         gobject_class->get_property = fm_output_alsa_get_property;
-        
+
+        gobject_class->dispose = fm_output_alsa_dispose;        
         gobject_class->finalize = fm_output_alsa_finalize;
         
@@ -136 +139 @@
         
         output_class->start = fm_output_alsa_start;
-        
+        output_class->stop = fm_output_alsa_stop;
         
         g_object_class_install_property (gobject_class,
@@ -248 +251 @@
         gint err;
         
-        g_print ("Activating FmOutputAlsa\n");
+//      g_print ("Activating FmOutputAlsa\n");
                 
         // Open the device
@@ -304 +307 @@
         }
         
-        g_print ("ALSA sample rate: %d\n", output->sample_rate);
+//      g_print ("ALSA sample rate: %d\n", output->sample_rate);
 
         guint n_channels = FM_CHANNELS_STEREO;
@@ -334 +337 @@
         }
         
-        g_print ("ALSA: buffer size is %lu\n", output_alsa->buffer_size);
-        
         err = snd_pcm_hw_params_set_period_time_near (output_alsa->sound_handle,
                                                       output_alsa->hwparams,
@@ -360 +361 @@
                 return FALSE;
         }
+
+/*      g_print ("ALSA: buffer size is %lu frames\n", output_alsa->buffer_size);
+        g_print ("ALSA: period size is %lu frames\n", output_alsa->period_size);*/
 
         output_alsa->buffer_size_samples = output_alsa->period_size;
@@ -378 +382 @@
 fm_output_alsa_deactivate               (FmElement      *element)
 {
-        /*FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (element);
+//      g_print ("ALSA: deactivate\n");
+        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (element);
         gint err;
         
         g_free (output_alsa->device_name);
         
+        snd_pcm_hw_free (output_alsa->sound_handle);
         err = snd_pcm_close (output_alsa->sound_handle);
         if (err < 0) {
@@ -397 +403 @@
         output_alsa->buffer_size = 0;
         output_alsa->period_size = 0;
-        output_alsa->engine_buffer = NULL;*/
+        output_alsa->thread = NULL;
+        output_alsa->stop_processing = FALSE;
+
+        g_free (output_alsa->buffer_int);
+        fm_buffer_destroy (output_alsa->main_buffer);
+
+        if (!fm_element_deactivate_connected (element))
+                return FALSE;
         
         return TRUE;
+}
+
+
+static void
+fm_output_alsa_dispose                  (GObject        *object)
+{
+        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (object);
+        g_assert (!output_alsa->sound_handle);
+        
+        G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -410 +433 @@
         
         g_free (output_alsa->device_name);
-        g_free (output_alsa);
+
+        G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -421 +445 @@
                 
         output_alsa->thread = g_thread_create (fm_output_alsa_play, output_alsa,
-                                               FALSE, &error);
+                                               TRUE, &error);
         if (output_alsa->thread) {
-                g_print("ALSA output started!\n");
+//              g_print("ALSA output started!\n");
                 return TRUE;
         } else {
@@ -432 +456 @@
 
 
+static gboolean
+fm_output_alsa_stop                     (FmOutput       *output)
+{
+        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA(output);
+
+        output_alsa->stop_processing = TRUE;
+
+//      g_print ("joining\n");
+        g_thread_join (output_alsa->thread);
+
+        return TRUE;
+}
+
+
 #define FLOAT_TO_INT(x) ((gint16) ((x) * 32768.0))
 
@@ -452 +490 @@
                                                  output_alsa->main_buffer->channel_data[1],
                                                  output_alsa->buffer_int, output_alsa->buffer_size_samples);
-
                 gint err = 0;
                 
@@ -458 +495 @@
                                       output_alsa->buffer_int, 
                                       output_alsa->buffer_size_samples);
+
+//              g_print ("ALSA: written %u frames\n", output_alsa->buffer_size_samples);
                                       
                 if (err < 0) {
@@ -478 +517 @@
         }
         
-        g_print ("output_alsa->stop_processing == TRUE!\n");
+//      g_print ("output_alsa->stop_processing == TRUE!\n");
         
         return NULL;

trunk/fm_server/src/fm_pipeline.c

@@ -108 +108 @@
                              0);
 
+        rgc_method_register ("deactivate",
+                             FM_TYPE_PIPELINE,
+                             G_CALLBACK (fm_pipeline_deactivate),
+                             rgc_marshal_VOID__VOID,
+                             0);
+
         rgc_method_register ("run",
                              FM_TYPE_PIPELINE,
@@ -155 +161 @@
 fm_pipeline_activate                    (FmPipeline     *pipeline)
 {
+        FmElement *element = FM_ELEMENT (pipeline);
         g_assert (FM_IS_PIPELINE (pipeline));
         g_return_if_fail (FM_IS_ELEMENT (pipeline->sink));
+        g_return_if_fail (!element->active);
                 
         g_print ("Activating pipeline...\n");
@@ -162 +170 @@
         pipeline->sample_rate = fm_output_get_sample_rate(pipeline->sink);
         fm_element_activate(FM_ELEMENT(pipeline->sink));
+}
+
+
+void
+fm_pipeline_deactivate                  (FmPipeline     *pipeline)
+{
+        g_assert (FM_IS_PIPELINE (pipeline));
+        g_return_if_fail (FM_IS_ELEMENT (pipeline->sink));
+                
+        g_print ("Deactivating pipeline...\n");
+        
+        fm_element_deactivate(FM_ELEMENT(pipeline->sink));
 }
 
@@ -225 +245 @@
         g_return_if_fail (FM_IS_PIPELINE (pipeline));
         g_return_if_fail (FM_IS_OUTPUT(pipeline->sink));
-        
+
         g_debug("Stopping pipeline...");
         fm_output_stop(pipeline->sink);

trunk/fm_server/src/fm_pipeline.h

@@ -69 +69 @@
 
 void
+fm_pipeline_deactivate                  (FmPipeline     *pipeline);
+
+void
 fm_pipeline_set_sink                    (FmPipeline     *pipeline,
                                          FmElement      *sink);