reworked settings: made it look more like other maemo dialogs, made some things stati...

[maemo-recorder] / src / maemo-recorder-ui.c

diff --git a/src/maemo-recorder-ui.c b/src/maemo-recorder-ui.c
index a06e086..9980aa8 100644 (file)
--- a/src/maemo-recorder-ui.c
+++ b/src/maemo-recorder-ui.c
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 et: */
+/* vim: set sts=4 sw=4 et: */
 /*
  * maemo-recorder-ui.c
  *
@@ -312,7 +312,8 @@ static gboolean createPipeline(AppData *app, PipeLineType type)
                         ULOG_ERR("gst_element_link failed for src, filter and sink!");
                         return FALSE;
                     }
-                    break;   
+                    break;
+
                 case FORMAT_WAV:
                     gst_bin_add_many(GST_BIN(pipeline), src, parse, sink, NULL);
                     if (!gst_element_link_many (src, parse, sink, NULL))
@@ -347,6 +348,7 @@ static gboolean createPipeline(AppData *app, PipeLineType type)
                     }
 
                     break;
+
                 case FORMAT_WAV:
                     gst_bin_add_many(GST_BIN(pipeline), src, parse, NULL);
                     if (!gst_element_link_many (src, parse, NULL))
@@ -357,7 +359,6 @@ static gboolean createPipeline(AppData *app, PipeLineType type)
                     app->playPipeline = pipeline;
                     g_signal_connect(parse, "pad_added",
                                  G_CALLBACK(new_pad_cb), app);
-             
                     break;
 
                 default:
@@ -425,6 +426,7 @@ static gboolean destroyPipeline(AppData *data, PipeLineType type)
             data->recPipeline = NULL;
             */
             break;
+
         default:
             pipeline = data->playPipeline;
             /*
@@ -504,11 +506,11 @@ static void pipelineStateChanged (GstElement *element,
           break;
 
         case GST_STATE_READY:
-          /* hildon_banner_show_information(GTK_WIDGET(data->mainView), NULL, "Ready..."); */
-          ULOG_INFO("%s() - Ready", G_STRFUNC);
-          gtk_entry_set_text(GTK_ENTRY(data->mainViewData.stateEntry), 
+            /* hildon_banner_show_information(GTK_WIDGET(data->mainView), NULL, "Ready..."); */
+            ULOG_INFO("%s() - Ready", G_STRFUNC);
+            gtk_entry_set_text(GTK_ENTRY(data->mainViewData.stateEntry), 
                      RECORDER_MSG_READY);  
-          break;
+            break;
 
         case GST_STATE_PAUSED:
           {
@@ -576,6 +578,7 @@ static gboolean cbBus(GstBus *bus,
             g_free (debug);
             break;
         }
+
         case GST_MESSAGE_ERROR: 
         {
             GError *err;
@@ -588,6 +591,7 @@ static gboolean cbBus(GstBus *bus,
             /* break; */
             /* flow through to eos */
         }
+
         case GST_MESSAGE_EOS:
         {
             ULOG_INFO("%s() - eos", G_STRFUNC);
@@ -613,6 +617,7 @@ static gboolean cbBus(GstBus *bus,
              }
              break;
         }
+
         case GST_MESSAGE_STATE_CHANGED: 
         {
             GstState old;
@@ -1081,7 +1086,7 @@ static void cbSave(GtkWidget* widget, AppData *data)
 
 static void cbSettings(GtkWidget* widget, AppData *data)
 {
-    edit_settings( widget, data );
+    settings_edit( widget, data );
 }
 
 static void cbSaveAs(GtkWidget* widget, AppData *data) 
@@ -1542,13 +1547,13 @@ static void createMenu( AppData *data )
     item_settings = gtk_menu_item_new_with_label (_("Settings"));
     
     item_pcma = gtk_radio_menu_item_new_with_label(
-        group, "PCM A-law");
+        group, FORMAT_NAME_PCMA);
     item_ilbc = gtk_radio_menu_item_new_with_label_from_widget(
-        GTK_RADIO_MENU_ITEM(item_pcma), "iLBC");
+        GTK_RADIO_MENU_ITEM(item_pcma), FORMAT_NAME_ILBC);
     item_pcmu = gtk_radio_menu_item_new_with_label_from_widget(
-        GTK_RADIO_MENU_ITEM(item_pcma), "PCM u-law");
+        GTK_RADIO_MENU_ITEM(item_pcma), FORMAT_NAME_PCMU);
     item_pcm = gtk_radio_menu_item_new_with_label_from_widget(
-        GTK_RADIO_MENU_ITEM(item_pcma), "WAV");
+        GTK_RADIO_MENU_ITEM(item_pcma), FORMAT_NAME_WAV);
     
     data->filter = get_default_filter();