X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fomnplay.cpp;h=b961c4b5d598ed101aa00e7731e778c3a9b1d706;hb=6a0af0e7bba391e04e5aac228b6b2743894c60e5;hp=9adc1b2679084f109c63217e5cad6e93895c0d0a;hpb=052a15645cad63a91402a58a77de6b4f5e52893d;p=omnplay

diff --git a/src/omnplay.cpp b/src/omnplay.cpp
index 9adc1b2..b961c4b 100644
--- a/src/omnplay.cpp
+++ b/src/omnplay.cpp
@@ -17,6 +17,10 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -64,8 +68,25 @@ void omnplay_destroy(omnplay_instance_t* app)
     free(app);
 };
 
+static int find_index_of_playlist_item(omnplay_instance_t* app, int start, int idx)
+{
+    while(1)
+    {
+        if(app->playlist.item[start].omn_idx == idx)
+            return start;
+
+        if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_END)
+            break;
+
+        start++;
+    };
+
+    return -1;
+};
+
 static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev , OmPlrStatus *curr)
 {
+    int idx;
     char tc_cur[32], tc_rem[32], state[32], status[32];
     const char *clip;
 
@@ -94,6 +115,7 @@ static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev ,
         strcpy(status, "OFFLINE");
     };
 
+    /* update status in status page */
     gdk_threads_enter();
     gtk_label_set_text(GTK_LABEL (player->label_tc_cur), tc_cur);
     gtk_label_set_text(GTK_LABEL (player->label_tc_rem), tc_rem);
@@ -103,6 +125,42 @@ static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev ,
     gdk_flush();
     gdk_threads_leave();
 
+    /* update remaining time */
+    gdk_threads_enter();
+    pthread_mutex_lock(&player->app->playlist.lock);
+    pthread_mutex_lock(&player->app->players.lock);
+    if(curr->state == omPlrStatePlay || curr->state == omPlrStateCuePlay)
+    {
+        idx = find_index_of_playlist_item(player->app, player->playlist_start, curr->currClipNum);
+        if(idx >= 0)
+        {
+            frames2tc(curr->currClipStartPos + curr->currClipLen - curr->pos, 25.0, tc_rem);
+            omnplay_playlist_draw_item_rem(player->app, idx, tc_rem);
+        }
+        if(curr->currClipNum != prev->currClipNum && 1 != prev->numClips)
+        {
+            tc_rem[0] = 0;
+            idx = find_index_of_playlist_item(player->app, player->playlist_start, prev->currClipNum);
+            if(idx >= 0)
+                omnplay_playlist_draw_item_rem(player->app, idx, tc_rem);
+        };
+    }
+    else
+    {
+        tc_rem[0] = 0;
+        idx = find_index_of_playlist_item(player->app, player->playlist_start, curr->currClipNum);
+        if(idx >= 0)
+            omnplay_playlist_draw_item_rem(player->app, idx, tc_rem);
+        idx = find_index_of_playlist_item(player->app, player->playlist_start, prev->currClipNum);
+        if(idx >= 0)
+            omnplay_playlist_draw_item_rem(player->app, idx, tc_rem);
+    };
+    pthread_mutex_unlock(&player->app->players.lock);
+    pthread_mutex_unlock(&player->app->playlist.lock);
+    gdk_flush();
+    gdk_threads_leave();
+
+
     memcpy(prev, curr, sizeof(OmPlrStatus));
 };
 
@@ -133,7 +191,7 @@ static void* omnplay_thread_proc(void* data)
     if(player->app->players.path[0])
     {
         pthread_mutex_lock(&player->app->players.lock);
-//        r = OmPlrClipSetDirectory((OmPlrHandle)player->handle, player->app->players.path);
+        r = OmPlrClipSetDirectory((OmPlrHandle)player->handle, player->app->players.path);
         pthread_mutex_unlock(&player->app->players.lock);
 
         if(r)
@@ -175,20 +233,71 @@ static void* omnplay_thread_proc(void* data)
     return NULL;
 };
 
-static int get_first_selected_item_playlist(omnplay_instance_t* app)
+void get_selected_items_playlist_proc(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
-    int idx;
-    GtkTreeIter iter;
-    GtkTreeModel *model;
+    int idx, *list = (int*)data;
+    gtk_tree_model_get(model, iter, 7, &idx, -1);
+    list[list[0] + 1] = idx;
+    list[0] = list[0] + 1;
+};
+
+static int* get_selected_items_playlist(omnplay_instance_t* app)
+{
+    int* list = NULL;
     GtkTreeSelection *selection;
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->playlist_grid));
-    if(selection && gtk_tree_selection_get_selected(selection, &model, &iter))
+    if(selection)
     {
-        gtk_tree_model_get(model, &iter, 7, &idx, -1);
-        return idx;
+        list = (int*)malloc(sizeof(int) * (MAX_PLAYLIST_ITEMS + 1));
+        memset(list, 0, sizeof(int) * (MAX_PLAYLIST_ITEMS + 1));
+
+        gtk_tree_selection_selected_foreach(
+            selection,
+            get_selected_items_playlist_proc,
+            list);
+
+        if(!list[0])
+        {
+            free(list);
+            list = NULL;
+        };
     };
-    return -1;
+
+    return list;
+};
+
+static void omnplay_playlist_block(omnplay_instance_t* app, control_buttons_t button)
+{
+    int start, stop;
+    int* list = get_selected_items_playlist(app);
+
+    if(!list)
+        return;
+
+    pthread_mutex_lock(&app->playlist.lock);
+    pthread_mutex_lock(&app->players.lock);
+
+    start = list[1];
+    stop = list[list[0]];
+
+    fprintf(stderr, "omnplay_playlist_block: [%d %d]\n",
+        start, stop);
+
+    pthread_mutex_unlock(&app->players.lock);
+    pthread_mutex_unlock(&app->playlist.lock);
+
+    free(list);
+};
+
+static int get_first_selected_item_playlist(omnplay_instance_t* app)
+{
+    int idx;
+    int* list = get_selected_items_playlist(app);
+    if(!list) return -1;
+    idx = list[1];
+    free(list);
+    return idx;
 };
 
 static int get_playlist_block(omnplay_instance_t* app, int idx, int* start_ptr, int* stop_ptr)
@@ -225,8 +334,9 @@ static omnplay_player_t *get_player_at_pos(omnplay_instance_t* app, int pos)
     return NULL;
 };
 
-static void omnplay_cue(omnplay_instance_t* app)
+static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button)
 {
+    int i, r;
     int idx, start, stop;
     omnplay_player_t *player;
 
@@ -258,22 +368,120 @@ static void omnplay_cue(omnplay_instance_t* app)
         return;
     };
 
-    /* 1. stop */
     pthread_mutex_lock(&app->players.lock);
-    OmPlrStop((OmPlrHandle)player->handle);
-    player->playlist_start = -1;
-    player->playlist_count = -1;
-    pthread_mutex_unlock(&app->players.lock);
 
-    /* 2. detach previous clips */
-    pthread_mutex_lock(&app->players.lock);
-    OmPlrDetachAllClips((OmPlrHandle)player->handle);
-    pthread_mutex_unlock(&app->players.lock);
+    if(BUTTON_PLAYER_STOP == button || BUTTON_PLAYER_CUE == button)
+    {
+        /* stop */
+        OmPlrStop((OmPlrHandle)player->handle);
 
-    // http://research.m1stereo.tv/viewvc-int/viewvc.cgi/Ingest2Srv/trunk/SrvPlayCtl.cpp?view=markup
+        /* detach previous clips */
+        player->playlist_length = -1;
+        OmPlrDetachAllClips((OmPlrHandle)player->handle);
+    };
 
-    pthread_mutex_unlock(&app->playlist.lock);
+    if(BUTTON_PLAYER_CUE == button)
+    {
+        int o, c, p = 0;
 
+        /* Attach clips to timeline */
+        for(i = start, c = 0, o = 0; i <= stop; i++)
+        {
+            OmPlrClipInfo clip;
+
+            /* get clip info */
+            clip.maxMsTracks = 0; 
+            clip.size = sizeof(clip);
+            r = OmPlrClipGetInfo((OmPlrHandle)player->handle, app->playlist.item[i].id, &clip);
+
+            if(!r)
+            {
+                unsigned int l;
+
+                fprintf(stderr, "OmPlrClipGetInfo(%s): firstFrame=%d, lastFrame=%d\n",
+                    app->playlist.item[i].id, clip.firstFrame, clip.lastFrame);
+
+                /* should we fix playlist clip timings */
+                if(!(
+                    app->playlist.item[i].in >= clip.firstFrame &&
+                    app->playlist.item[i].in + app->playlist.item[i].dur <= clip.lastFrame) ||
+                    !app->playlist.item[i].dur)
+                {
+                    fprintf(stderr, "cue: item [%s] will be updated [%d;%d]->[%d;%d]\n",
+                        app->playlist.item[i].id,
+                        app->playlist.item[i].in, app->playlist.item[i].dur,
+                        clip.firstFrame, clip.lastFrame - clip.firstFrame);
+
+                    app->playlist.item[i].in = clip.firstFrame;
+                    app->playlist.item[i].dur = clip.lastFrame - clip.firstFrame;
+                    omnplay_playlist_draw_item(app, i);
+                };
+
+                r = OmPlrAttach((OmPlrHandle)player->handle,
+                    app->playlist.item[i].id,
+                    app->playlist.item[i].in,
+                    app->playlist.item[i].in + app->playlist.item[i].dur,
+                    0, omPlrShiftModeAfter, &l);
+            };
+
+            if(r)
+            {
+                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;
+            }
+            else
+            {
+                app->playlist.item[i].omn_idx = c;
+                app->playlist.item[i].omn_offset = o;
+
+                /* save selected item offset */
+                if(i == idx) p = o;
+
+                c++;
+                o += app->playlist.item[i].dur;
+            };
+        };
+
+        if(c)
+        {
+            OmPlrStatus hs;
+
+            /* Set timeline min/max */
+            OmPlrSetMinPosMin((OmPlrHandle)player->handle);
+            OmPlrSetMaxPosMax((OmPlrHandle)player->handle);
+
+            /* Set timeline position */
+            hs.minPos = 0;
+            hs.size = sizeof(OmPlrStatus);
+            OmPlrGetPlayerStatus((OmPlrHandle)player->handle, &hs);
+            OmPlrSetPos((OmPlrHandle)player->handle, hs.minPos + p);
+
+            /* setup loop */
+            if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_LOOP)
+                OmPlrLoop((OmPlrHandle)player->handle, hs.minPos, hs.maxPos);
+
+            player->playlist_start = start;
+            player->playlist_length = stop - start + 1;
+
+            /* Cue */
+            OmPlrCuePlay((OmPlrHandle)player->handle, 0.0);
+        };
+    };
+
+    if(BUTTON_PLAYER_PLAY == button)
+    {
+        /* play */
+        OmPlrPlay((OmPlrHandle)player->handle, 1.0);
+    };
+
+    if(BUTTON_PLAYER_PAUSE == button)
+        /* pause */
+        OmPlrPlay((OmPlrHandle)player->handle, 0.0);
+
+    pthread_mutex_unlock(&app->players.lock);
+
+    pthread_mutex_unlock(&app->playlist.lock);
 };
 
 static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t button)
@@ -283,6 +491,7 @@ static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t
         case BUTTON_PLAYLIST_ITEM_ADD:
         case BUTTON_PLAYLIST_ITEM_DEL:
         case BUTTON_PLAYLIST_ITEM_EDIT:
+            break;
         case BUTTON_PLAYLIST_LOAD:
             omnplay_playlist_load(app);
             break;
@@ -291,13 +500,17 @@ static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t
             break;
         case BUTTON_PLAYLIST_BLOCK_SINGLE:
         case BUTTON_PLAYLIST_BLOCK_LOOP:
+            omnplay_playlist_block(app, button);
+            break;
         case BUTTON_PLAYLIST_ITEM_UP:
         case BUTTON_PLAYLIST_ITEM_DOWN:
+            break;
         case BUTTON_PLAYER_CUE:
-            omnplay_cue(app);
         case BUTTON_PLAYER_PLAY:
         case BUTTON_PLAYER_PAUSE:
         case BUTTON_PLAYER_STOP:
+            omnplay_ctl(app, button);
+            break;
         case BUTTON_LIBRARY_ADD:
         case BUTTON_LIBRARY_REFRESH:
             break;
@@ -321,12 +534,15 @@ static gboolean on_button_click(GtkWidget *button, gpointer user_data)
 void omnplay_init(omnplay_instance_t* app)
 {
     int i;
+    pthread_mutexattr_t attr;
+
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 
     gtk_signal_connect( GTK_OBJECT( app->window ), "destroy",
         GTK_SIGNAL_FUNC(on_main_window_delete_event), app);
 
     /* create lock */
-    pthread_mutex_init(&app->players.lock, NULL);
+    pthread_mutex_init(&app->players.lock, &attr);
 
     /* create a omneon status thread */
     for(i = 0; i < app->players.count; i++)
@@ -334,7 +550,7 @@ void omnplay_init(omnplay_instance_t* app)
             omnplay_thread_proc, &app->players.item[i]);
 
     /* create lock */
-    pthread_mutex_init(&app->playlist.lock, NULL);
+    pthread_mutex_init(&app->playlist.lock, &attr);
 
     /* attach buttons click */
     for(i = 1; i < BUTTON_LAST; i++)