X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fomnplay.cpp;h=b9badfbc6957203a2ba1f7b82b16da86db23efcc;hb=5a2f0a475dfa74cb43b5abeb69dce4fd386e2fdb;hp=bd5b46d308414d8e2d85693b9fcc0deb2d47a9aa;hpb=af72d979bc8b5168b4cf8fc5df1b987d8587e837;p=melted_gui diff --git a/src/omnplay.cpp b/src/omnplay.cpp index bd5b46d..b9badfb 100644 --- a/src/omnplay.cpp +++ b/src/omnplay.cpp @@ -39,10 +39,64 @@ #include "omplrclnt.h" +int omnplay_get_content(omnplay_instance_t* app, playlist_item_t *items, int limit, + omnplay_get_content_cb_proc proc, void* data) +{ + int r, c = 0; + OmPlrClipInfo clip_info; + char clip_name[omPlrMaxClipDirLen]; + + pthread_mutex_lock(&app->players.lock); + + r = OmPlrClipGetFirst((OmPlrHandle)app->players.item[0].handle, clip_name, sizeof(clip_name)); + for(; c < limit && !r;) + { + /* get clip info */ + clip_info.maxMsTracks = 0; + clip_info.size = sizeof(clip_info); + + r = OmPlrClipGetInfo((OmPlrHandle)app->players.item[0].handle, clip_name, &clip_info); + + if(!r) + { + /* copy item props */ + strncpy(items[c].id, clip_name, PATH_MAX); + items[c].in = clip_info.firstFrame; + items[c].dur = clip_info.lastFrame - clip_info.firstFrame; + + /* callback */ + pthread_mutex_unlock(&app->players.lock); + if(proc) + proc(app, &items[c], data); + pthread_mutex_lock(&app->players.lock); + + c++; + }; + + r = OmPlrClipGetNext((OmPlrHandle)app->players.item[0].handle, clip_name, sizeof(clip_name)); + }; + + pthread_mutex_unlock(&app->players.lock); + + return c; +}; + + static gboolean on_main_window_delete_event( GtkWidget *widget, GdkEvent *event, gpointer user_data ) { - gtk_exit(0); - return TRUE; + g_print ("delete event occurred [start]\n"); + gdk_threads_leave(); + omnplay_release((omnplay_instance_t*)user_data); + gdk_threads_enter(); + g_print ("delete event occurred [finish]\n"); + + return FALSE; +} + +static void on_main_window_destroy( GtkWidget *widget, gpointer user_data ) +{ + g_print ("destroy occurred\n"); + gtk_main_quit(); } omnplay_instance_t* omnplay_create(int argc, char** argv) @@ -428,7 +482,7 @@ static void omnplay_playlist_delete_items(omnplay_instance_t* app, int* idxs, in idx = idxs[j] - j; /* fix block types */ - if(!idx) + if(idx) app->playlist.item[idx - 1].type = (playlist_item_type_t)(app->playlist.item[idx - 1].type | OMNPLAY_PLAYLIST_BLOCK_END); if(idx + 1 < app->playlist.count) @@ -588,6 +642,7 @@ static void omnplay_playlist_item_add(omnplay_instance_t* app, int after) memset(&item, 0, sizeof(playlist_item_t)); if(ui_playlist_item_dialog(app, &item)) { + omnplay_library_normalize_item(app, &item); item.type = t; omnplay_playlist_insert_items(app, idx, &item, 1); }; @@ -612,6 +667,7 @@ static void omnplay_playlist_item_edit(omnplay_instance_t* app) if(ui_playlist_item_dialog(app, &item)) { + omnplay_library_normalize_item(app, &item); app->playlist.item[idx] = item; omnplay_playlist_draw_item(app, idx); }; @@ -712,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; @@ -771,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; @@ -806,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); @@ -837,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) @@ -873,7 +966,10 @@ 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; }; @@ -922,6 +1018,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; @@ -949,9 +1061,12 @@ void omnplay_init(omnplay_instance_t* app) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - gtk_signal_connect( GTK_OBJECT( app->window ), "destroy", + gtk_signal_connect( GTK_OBJECT( app->window ), "delete-event", GTK_SIGNAL_FUNC(on_main_window_delete_event), app); + gtk_signal_connect( GTK_OBJECT( app->window ), "destroy", + GTK_SIGNAL_FUNC(on_main_window_destroy), app); + gtk_widget_add_events(app->playlist_grid, GDK_BUTTON_PRESS_MASK); gtk_signal_connect(GTK_OBJECT(app->playlist_grid), "key-press-event", GTK_SIGNAL_FUNC(on_playlist_grid_key), app); @@ -972,6 +1087,11 @@ void omnplay_init(omnplay_instance_t* app) gtk_signal_connect(GTK_OBJECT(app->buttons[i]), "clicked", GTK_SIGNAL_FUNC( on_button_click), app ); + /* create lock */ + pthread_mutex_init(&app->library.lock, &attr); + + /* load library */ + omnplay_library_load(app); }; void omnplay_release(omnplay_instance_t* app) @@ -990,4 +1110,20 @@ void omnplay_release(omnplay_instance_t* app) /* destroy lock */ pthread_mutex_destroy(&app->playlist.lock); + + /* load library */ + omnplay_library_save(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); };