X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fomnplay.cpp;h=d6202e2c5621aafe69ba03b62f98f3dc5fec53d4;hb=d27e5326da43856ff804ce7b9e90bbf36c5712a5;hp=b08f6861bb34f0b2b0be3bb4ccfafed18ad92634;hpb=a2a67895d9518b919c5ab0103e7b8ce70baa789f;p=melted_gui

diff --git a/src/omnplay.cpp b/src/omnplay.cpp
index b08f686..d6202e2 100644
--- a/src/omnplay.cpp
+++ b/src/omnplay.cpp
@@ -768,11 +768,13 @@ static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button)
                 fprintf(stderr, "cue: failed with %d, %s\n", r, OmPlrGetErrorString((OmPlrError)r));
                 app->playlist.item[i].omn_idx = -1;
                 app->playlist.item[i].omn_offset = -1;
+                app->playlist.item[i].error |= PLAYLIST_ITEM_ERROR_CUE;
             }
             else
             {
                 app->playlist.item[i].omn_idx = c;
                 app->playlist.item[i].omn_offset = o;
+                app->playlist.item[i].error &= 0xF ^ PLAYLIST_ITEM_ERROR_CUE;
 
                 /* save selected item offset */
                 if(i == idx) p = o;
@@ -827,7 +829,7 @@ static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button)
 
 static void omnplay_playlist_item_swap(omnplay_instance_t* app, int dir)
 {
-    int sel, a, b;
+    int sel, a, b, e = 1;
     GtkTreePath* path;
     playlist_item_t item;
 
@@ -862,21 +864,25 @@ static void omnplay_playlist_item_swap(omnplay_instance_t* app, int dir)
     app->playlist.item[b] = item;
 
     /* rewite type */
-    app->playlist.item[a].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE;
-    app->playlist.item[b].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE;
+    if(app->playlist.item[a].type != app->playlist.item[b].type)
+    {
+        e = 0;
+        app->playlist.item[a].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE;
+        app->playlist.item[b].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE;
+    };
 
     /* redraw main items */
     omnplay_playlist_draw_item(app, a);
     omnplay_playlist_draw_item(app, b);
 
     /* fix block types */
-    if(a)
+    if(a && !e)
     {
         app->playlist.item[a - 1].type = (playlist_item_type_t)(app->playlist.item[a - 1].type |
             OMNPLAY_PLAYLIST_BLOCK_END);
         omnplay_playlist_draw_item(app, a - 1);
     };
-    if(b + 1 < app->playlist.count)
+    if(b + 1 < app->playlist.count && !e)
     {
         app->playlist.item[b + 1].type = (playlist_item_type_t)(app->playlist.item[b + 1].type |
             OMNPLAY_PLAYLIST_BLOCK_BEGIN);
@@ -893,6 +899,37 @@ static void omnplay_playlist_item_swap(omnplay_instance_t* app, int dir)
     pthread_mutex_unlock(&app->playlist.lock);
 };
 
+static void omnplay_library_add(omnplay_instance_t* app, int after)
+{
+    int idx, c, i;
+    playlist_item_t* items;
+    playlist_item_type_t t;
+
+    /* find insert position */
+    idx = get_first_selected_item_playlist(app);
+    if(idx < 0)
+        idx = 0;
+    else
+        idx += (after)?1:0;
+
+    if(!omnplay_playlist_insert_check(app, idx, &t))
+        return;
+
+    items = omnplay_library_get_selected(app, &c);
+
+    /* clear item */
+    if(items)
+    {
+        for(i = 0; i < c; i++)
+        {
+            items[i].type = t;
+            items[i].error = 0;
+        };
+        omnplay_playlist_insert_items(app, idx, items, c);
+    };
+};
+
+
 static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t button)
 {
     switch(button)
@@ -929,10 +966,17 @@ static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t
             omnplay_ctl(app, button);
             break;
         case BUTTON_LIBRARY_ADD:
+            omnplay_library_add(app, 0);
             break;
         case BUTTON_LIBRARY_REFRESH:
             omnplay_library_refresh(app);
             break;
+        case BUTTON_LIBRARY_FIND:
+            omnplay_library_search(app, 0);
+            break;
+        case BUTTON_LIBRARY_FIND_NEXT:
+            omnplay_library_search(app, 1);
+            break;
     };
 
     return TRUE;
@@ -980,6 +1024,22 @@ static gboolean on_playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpoi
                 return TRUE;
             };
             break;
+        case GDK_S:
+        case GDK_s:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                omnplay_playlist_save(app);
+                return TRUE;
+            };
+            break;
+        case GDK_O:
+        case GDK_o:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                omnplay_playlist_load(app);
+                return TRUE;
+            };
+            break;
         case GDK_KEY_space:
             omnplay_ctl(app, BUTTON_PLAYER_PLAY);
             return TRUE;
@@ -1000,6 +1060,41 @@ static gboolean on_playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpoi
     return FALSE;
 };
 
+static gboolean on_library_grid_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+    omnplay_instance_t* app = (omnplay_instance_t*)data;
+
+    switch(event->keyval)
+    {
+        case GDK_C:
+        case GDK_c:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                fprintf(stderr, "CTRL+c\n");
+                return TRUE;
+            };
+            break;
+        case GDK_V:
+        case GDK_v:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                fprintf(stderr, "CTRL+v\n");
+                return TRUE;
+            };
+            break;
+        case GDK_X:
+        case GDK_x:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                fprintf(stderr, "CTRL+x\n");
+                return TRUE;
+            };
+            break;
+    };
+
+    return FALSE;
+};
+
 void omnplay_init(omnplay_instance_t* app)
 {
     int i;
@@ -1017,6 +1112,10 @@ void omnplay_init(omnplay_instance_t* app)
     gtk_signal_connect(GTK_OBJECT(app->playlist_grid), "key-press-event",
         GTK_SIGNAL_FUNC(on_playlist_grid_key), app);
 
+    gtk_widget_add_events(app->library_grid, GDK_BUTTON_PRESS_MASK);
+    gtk_signal_connect(GTK_OBJECT(app->library_grid), "key-press-event",
+        GTK_SIGNAL_FUNC(on_library_grid_key), app);
+
     /* create lock */
     pthread_mutex_init(&app->players.lock, &attr);
 
@@ -1063,3 +1162,13 @@ void omnplay_release(omnplay_instance_t* app)
     /* destroy library lock */
     pthread_mutex_destroy(&app->library.lock);
 };
+
+void omnplay_playlist_normalize(omnplay_instance_t* app)
+{
+    int i;
+
+    /* normalize playlist */
+    for(i = 0; i < app->playlist.count; i++)
+        if(omnplay_library_normalize_item(app, &app->playlist.item[i]))
+            omnplay_playlist_draw_item(app, i);
+};