X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;fp=src%2Flibrary.c;h=0ca9e38221bcb070c4057d40535f6f82b902e54c;hb=8f058cdb606938af320e3ca33a7c10a14741a0d6;hp=62bed435c418ee05c2fe3b150fa8e78994b5a161;hpb=f7a7ec28803cfb5c28186f846cd4fbab872e66bc;p=melted_gui

diff --git a/src/library.c b/src/library.c
index 62bed43..0ca9e38 100644
--- a/src/library.c
+++ b/src/library.c
@@ -1,6 +1,6 @@
 /*
- * playlist.c -- GTK+ 2 omnplay
- * Copyright (C) 2011 Maksym Veremeyenko <verem@m1stereo.tv>
+ * library.c -- GTK+ 2 melted gui
+ * Copyright (C) 2012 Maksym Veremeyenko <verem@m1stereo.tv>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,10 +33,47 @@
 #include <pthread.h>
 #include <string.h>
 
-#include "omnplay.h"
+#include <mvcp/mvcp.h>
+#include <mvcp/mvcp_remote.h>
+
+#include "instance.h"
 #include "ui.h"
 #include "timecode.h"
 
+void library_release(instance_t* app)
+{
+    mvcp_close(app->library.handle[0]);
+    mvcp_parser_close(app->library.handle[1]);
+};
+
+void library_init(instance_t* app)
+{
+    /* connect to library */
+    app->library.handle[1] = mvcp_parser_init_remote(app->players.host, 5250);
+    app->library.handle[0] = mvcp_init(app->library.handle[1]);
+    if(mvcp_connect(app->library.handle[0]) != mvcp_ok)
+    {
+        g_warning("library_init: failed to connect to server %s", app->players.host);
+        return;
+    };
+#if 0
+    pthread_mutex_lock(&app->library.lock);
+
+    if(app->library.filename[0])
+    {
+        app->library.count = MAX_LIBRARY_ITEMS;
+        omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename);
+    };
+
+    omnplay_library_sort(app);
+
+    pthread_mutex_unlock(&app->library.lock);
+
+    omnplay_library_draw(app);
+#endif
+};
+
+#if 0
 playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id)
 {
     int i;
@@ -218,22 +255,6 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
     return r;
 };
 
-void omnplay_library_load(omnplay_instance_t* app)
-{
-    pthread_mutex_lock(&app->library.lock);
-
-    if(app->library.filename[0])
-    {
-        app->library.count = MAX_LIBRARY_ITEMS;
-        omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename);
-    };
-
-    omnplay_library_sort(app);
-
-    pthread_mutex_unlock(&app->library.lock);
-
-    omnplay_library_draw(app);
-};
 
 static void omnplay_library_save_file(playlist_item_t* item, int count, char* filename)
 {
@@ -483,3 +504,5 @@ void omnplay_library_search(omnplay_instance_t* app, int next)
 
     pthread_mutex_unlock(&app->library.lock);
 };
+
+#endif