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

diff --git a/src/ui.c b/src/ui.c
index 2d434d3..e0541c9 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -59,7 +59,7 @@ static const column_desc_t playlist_columns[] =
         G_TYPE_STRING
     },
     {
-        "ID",
+        "TITLE",
         G_TYPE_STRING
     },
     {
@@ -71,7 +71,7 @@ static const column_desc_t playlist_columns[] =
         G_TYPE_STRING
     },
     {
-        "TITLE",
+        "ID",
         G_TYPE_STRING
     },
     {
@@ -905,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",
@@ -957,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",
@@ -986,12 +986,14 @@ 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)
@@ -1050,7 +1052,7 @@ int ui_playlist_load(instance_t* app, char* path, struct ui_playlist_io_funcs* p
         filename2 = (char*)malloc(PATH_MAX);
         strncpy(filename2, filename, PATH_MAX);
         l = strlen(filename2);
-        if(l < 4 || strcasecmp(filename2 + i - 4, procs[i].ext + 1))
+        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));
@@ -1119,7 +1121,7 @@ int ui_playlist_save(instance_t* app, char* path, struct ui_playlist_io_funcs* p
         filename2 = (char*)malloc(PATH_MAX);
         strncpy(filename2, filename, PATH_MAX);
         l = strlen(filename2);
-        if(l < 4 || strcasecmp(filename2 + i - 4, procs[i].ext + 1))
+        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));