Changeset 250 for trunk

Timestamp:

06/04/08 21:36:21 (4 years ago)

Author:

ath

Message:

Don't crash if unable to start the output element.

Files:

• trunk/fm_server/src/fm_output.c (modified) (2 diffs)

trunk/fm_server/src/fm_output.c

@@ -108 +108 @@
 fm_output_start                         (FmOutput       *output)
 {
-        FmOutputClass *class = FM_OUTPUT_GET_CLASS(output);
-        
-        if (class->start)
-                return (*class->start)(output);
+        FmOutputClass *klass = FM_OUTPUT_GET_CLASS (output);
+        FmElement *element = FM_ELEMENT (output);
+
+        if (!element->active) {
+                g_warning ("element \"%s\" is not active, cancel start!",
+                         fm_element_get_name (FM_ELEMENT (output)));
+                return FALSE;
+        }
+
+        if (klass->start)
+                return (*klass->start) (output);
         else {
                 g_warning ("\"start\" method not defined for element \"%s\"!",
-                         fm_element_get_name(FM_ELEMENT(output)));
+                         fm_element_get_name (FM_ELEMENT (output)));
                 return FALSE;
         }
@@ -123 +130 @@
 fm_output_stop                          (FmOutput       *output)
 {
-        FmOutputClass *class = FM_OUTPUT_GET_CLASS(output);
+        FmOutputClass *klass = FM_OUTPUT_GET_CLASS (output);
+        FmElement *element = FM_ELEMENT (output);
+
+        if (!element->active) {
+                g_warning ("element \"%s\" is not active, cancel start!",
+                         fm_element_get_name (FM_ELEMENT (output)));
+                return FALSE;           
+        }
         
-        if (class->stop)
-                return (*class->stop)(output);
+        if (klass->stop)
+                return (*klass->stop) (output);
         else {
                 g_warning ("\"stop\" method not defined for element \"%s\"!",
-                         fm_element_get_name(FM_ELEMENT(output)));
+                         fm_element_get_name (FM_ELEMENT (output)));
                 return FALSE;
         }