drop library update window

[omnplay] / src / omnplay.cpp

diff --git a/src/omnplay.cpp b/src/omnplay.cpp
index 8213402..8c2bafc 100644 (file)
--- a/src/omnplay.cpp
+++ b/src/omnplay.cpp
@@ -124,6 +124,9 @@ void omnplay_destroy(omnplay_instance_t* app)
 
 static int find_index_of_playlist_item(omnplay_instance_t* app, int start, int idx)
 {
+    if(start < 0 || start >= app->playlist.count)
+        return -1;
+
     while(1)
     {
         if(app->playlist.item[start].omn_idx == idx)
@@ -226,6 +229,9 @@ static void* omnplay_thread_proc(void* data)
 
     g_warning("omnplay_thread_proc\n");
 
+    memset(&st_curr, 0, sizeof(OmPlrStatus));
+    memset(&st_prev, 0, sizeof(OmPlrStatus));
+
     /* connect */
     pthread_mutex_lock(&player->app->players.lock);
     r = OmPlrOpen(player->host, player->name, (OmPlrHandle*)&player->handle);
@@ -1241,24 +1247,19 @@ void omnplay_init(omnplay_instance_t* app)
 
     /* create lock */
     pthread_mutex_init(&app->players.lock, &attr);
+    pthread_mutex_init(&app->playlist.lock, &attr);
+    pthread_mutex_init(&app->library.lock, &attr);
 
     /* create a omneon status thread */
     for(i = 0; i < app->players.count; i++)
-        pthread_create(&app->players.item[i].thread, NULL,
-            omnplay_thread_proc, &app->players.item[i]);
-
-
-    /* create lock */
-    pthread_mutex_init(&app->playlist.lock, &attr);
+        app->players.item[i].thread = g_thread_create(
+            omnplay_thread_proc, &app->players.item[i], TRUE, NULL);
 
     /* attach buttons click */
     for(i = 1; i < BUTTON_LAST; i++)
         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);
 
@@ -1268,13 +1269,12 @@ void omnplay_init(omnplay_instance_t* app)
 void omnplay_release(omnplay_instance_t* app)
 {
     int i;
-    void* r;
 
     app->f_exit = 1;
 
     for(i = 0; i < app->players.count; i++)
         /* create a omneon status thread */
-        pthread_join(app->players.item[i].thread, &r);
+        g_thread_join(app->players.item[i].thread);
 
     /* destroy lock */
     pthread_mutex_destroy(&app->players.lock);
@@ -1298,3 +1298,12 @@ void omnplay_playlist_normalize(omnplay_instance_t* app)
         if(omnplay_library_normalize_item(app, &app->playlist.item[i]))
             omnplay_playlist_draw_item(app, i);
 };
+
+void omnplay_set_status(omnplay_instance_t* app, char* str)
+{
+    gdk_threads_enter();
+//    gtk_label_set_text(GTK_LABEL(data), str);
+    gdk_flush();
+    gdk_threads_leave();
+};
+