X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=e0541c93dd431e6079e1023dcc4beba0a56737c1;hb=b2b735205d9b6c57635a052c8d4af1329bfda723;hp=cf5168fbe19aa9e7c2c828453fe1755d6acbad73;hpb=86c9dd5a491cd7ebead02b73896af7e65084a3d4;p=melted_gui

diff --git a/src/ui.c b/src/ui.c
index cf5168f..e0541c9 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -58,7 +59,7 @@ static const column_desc_t playlist_columns[] =
         G_TYPE_STRING
     },
     {
-        "ID",
+        "TITLE",
         G_TYPE_STRING
     },
     {
@@ -70,7 +71,7 @@ static const column_desc_t playlist_columns[] =
         G_TYPE_STRING
     },
     {
-        "TITLE",
+        "ID",
         G_TYPE_STRING
     },
     {
@@ -904,10 +905,10 @@ void ui_playlist_draw(instance_t* app)
             0, "",
             1, app->playlist.block_icons[app->playlist.item[i].type],
             2, ch,
-            3, app->playlist.item[i].id,
+            3, app->playlist.item[i].title,
             4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
             5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
-            6, app->playlist.item[i].title,
+            6, app->playlist.item[i].id,
             7, i,
             8, (app->playlist.item[i].error != 0),
             9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange",
@@ -956,10 +957,10 @@ static gboolean ui_playlist_draw_item_iter
         0, "",
         1, app->playlist.block_icons[app->playlist.item[i].type],
         2, ch,
-        3, app->playlist.item[i].id,
+        3, app->playlist.item[i].title,
         4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
         5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
-        6, app->playlist.item[i].title,
+        6, app->playlist.item[i].id,
         7, i,
         8, (app->playlist.item[i].error != 0),
         9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange",
@@ -985,20 +986,39 @@ void ui_playlist_draw_item(instance_t* app, int idx)
     pthread_mutex_unlock(&app->playlist.lock);
 };
 
-void ui_set_status(instance_t* app, char* str)
+void ui_set_status(instance_t* app, char* str, int lock)
 {
-    gdk_threads_enter();
+    if(lock)
+        gdk_threads_enter();
     gtk_label_set_text(GTK_LABEL(app->status_label), str);
     gdk_flush();
-    gdk_threads_leave();
+    if(lock)
+        gdk_threads_leave();
+};
+
+void ui_show_error(GtkWidget *window, char* title, char* message)
+{
+    GtkWidget *dialog;
+    dialog = gtk_message_dialog_new
+    (
+        GTK_WINDOW(window),
+        GTK_DIALOG_DESTROY_WITH_PARENT,
+        GTK_MESSAGE_ERROR,
+        GTK_BUTTONS_OK,
+        message
+    );
+
+    gtk_window_set_title(GTK_WINDOW(dialog), title);
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
 };
 
 int ui_playlist_load(instance_t* app, char* path, struct ui_playlist_io_funcs* procs)
 {
     int r, i;
-
     GtkWidget *dialog;
     GtkFileFilter *filter;
+    char error_message[1024];
 
     dialog = gtk_file_chooser_dialog_new("Open File",
         GTK_WINDOW (app->window),
@@ -1022,13 +1042,25 @@ int ui_playlist_load(instance_t* app, char* path, struct ui_playlist_io_funcs* p
 
     if(r == GTK_RESPONSE_ACCEPT)
     {
-        char *filename;
+        int l;
+        char *filename, *filename2;
 
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
         i = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog))), "id"));
 
-        r = procs[i].load(app, filename);
+        filename2 = (char*)malloc(PATH_MAX);
+        strncpy(filename2, filename, PATH_MAX);
+        l = strlen(filename2);
+        if(l < 4 || strcasecmp(filename2 + l - 4, procs[i].ext + 1))
+            strcat(filename2, procs[i].ext + 1);
+
+        r = procs[i].load(app, filename2, error_message, sizeof(error_message));
+
+        if(r)
+            ui_show_error(dialog, "Playlist loading error", error_message);
+
+        free(filename2);
 
         ui_playlist_draw(app);
 
@@ -1053,6 +1085,7 @@ int ui_playlist_save(instance_t* app, char* path, struct ui_playlist_io_funcs* p
     int r, i;
     GtkWidget *dialog;
     GtkFileFilter *filter;
+    char error_message[1024];
 
     dialog = gtk_file_chooser_dialog_new("Save File",
         GTK_WINDOW (app->window),
@@ -1078,13 +1111,25 @@ int ui_playlist_save(instance_t* app, char* path, struct ui_playlist_io_funcs* p
 
     if(r == GTK_RESPONSE_ACCEPT)
     {
-        char *filename;
+        int l;
+        char *filename, *filename2;
 
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
         i = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog))), "id"));
 
-        r = procs[i].save(app, filename);
+        filename2 = (char*)malloc(PATH_MAX);
+        strncpy(filename2, filename, PATH_MAX);
+        l = strlen(filename2);
+        if(l < 4 || strcasecmp(filename2 + l - 4, procs[i].ext + 1))
+            strcat(filename2, procs[i].ext + 1);
+
+        r = procs[i].save(app, filename2, error_message, sizeof(error_message));
+
+        if(r)
+            ui_show_error(dialog, "Playlist saving error", error_message);
+
+        free(filename2);
 
         if(app->playlist.path)
             g_free(app->playlist.path);