Move ProgressUpdateInfo struct

[mapper] / src / audio-note.c

diff --git a/src/audio-note.c b/src/audio-note.c
index 8c94525b788675cc8aef579bba0ac75051260060..8b4e26866c1195a4a9e386753abed4370a11738f 100644 (file)
--- a/src/audio-note.c
+++ b/src/audio-note.c
@@ -102,7 +102,6 @@ if (ena)
 static gboolean
 audio_note_record_cb(GtkWidget *widget, gpointer data)
 {
-const gchar *basedir;
 gchar buffer[128];
 audio_note_ui *ui=(audio_note_ui *)data;
 time_t t;
@@ -178,36 +177,47 @@ audio_note_ui *
 audio_note_new(void)
 {
 audio_note_ui *ui;
+GtkWidget *v;
+
 ui=g_slice_new(audio_note_ui);
 ui->pos_sid=0;
 ui->cfile=NULL;
-ui->vbox=gtk_vbox_new(FALSE, 0);
+
+ui->vbox=gtk_vbox_new(FALSE, 3);
+v=gtk_vbox_new(FALSE, 3);
+ui->hbox=gtk_hbox_new(FALSE, 3);
 ui->lbl_time=gtk_label_new("");
+
 ui->btn_record=gtk_button_new_from_stock(GTK_STOCK_MEDIA_RECORD);
 ui->btn_play=gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
 ui->btn_stop=gtk_button_new_from_stock(GTK_STOCK_MEDIA_STOP);
 
+ui->file_tree=gtk_tree_view_new();
+
 gtk_widget_set_sensitive(ui->btn_play, FALSE);
 gtk_widget_set_sensitive(ui->btn_stop, FALSE);
 
-gtk_box_pack_start(GTK_BOX(ui->vbox), ui->lbl_time, TRUE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(ui->vbox), ui->lbl_time, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(ui->vbox), ui->hbox, TRUE, TRUE, 0);
 
-gtk_box_pack_start(GTK_BOX(ui->vbox), ui->btn_record, TRUE, TRUE, 0);
-gtk_box_pack_start(GTK_BOX(ui->vbox), ui->btn_play, TRUE, TRUE, 0);
-gtk_box_pack_start(GTK_BOX(ui->vbox), ui->btn_stop, TRUE, TRUE, 0);
+gtk_box_pack_start(GTK_BOX(v), ui->btn_record, TRUE, TRUE, 0);
+gtk_box_pack_start(GTK_BOX(v), ui->btn_play, TRUE, TRUE, 0);
+gtk_box_pack_start(GTK_BOX(v), ui->btn_stop, TRUE, TRUE, 0);
+
+gtk_box_pack_start(GTK_BOX(ui->hbox), ui->file_tree, TRUE, TRUE, 0);
+gtk_box_pack_start(GTK_BOX(ui->hbox), v, TRUE, TRUE, 0);
+
+gtk_label_set_text(GTK_LABEL(ui->lbl_time), "--:--");
 
 ui->note_play=&note_play;
 ui->note_record=&note_record;
+ui->basedir=NULL;
 
 /* XXX: Make this a configuration option */
 #ifdef WITH_DEVICE_770
-ui->basedir=NOTES_BASEDIR_MMC1;
-if (g_mkdir_with_parents(ui->basedir, 0775)==-1) {
-       MACRO_BANNER_SHOW_INFO(_window, _("Failed to create directory for sound files!"));
-       return TRUE;
-}
+audio_note_set_basedir(ui, NOTES_BASEDIR_MMC1);
 #else
-ui->basedir=g_get_home_dir();
+audio_note_set_basedir(ui, g_get_home_dir());
 #endif
 
 g_signal_connect(G_OBJECT(ui->btn_record), "clicked", G_CALLBACK(audio_note_record_cb), ui);
@@ -217,6 +227,16 @@ g_signal_connect(G_OBJECT(ui->btn_stop), "clicked", G_CALLBACK(audio_note_stop_c
 return ui;
 }
 
+void
+audio_note_set_basedir(audio_note_ui *ui, const gchar *basedir)
+{
+if (ui->basedir)
+       g_free(ui->basedir);
+ui->basedir=g_strdup(basedir);
+if (g_mkdir_with_parents(ui->basedir, 0775)==-1) {
+}
+}
+
 static gboolean
 audio_note_bus_cb(GstBus *bus, GstMessage *msg, gpointer data)
 {