X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fopts.c;h=55b0d776ecc7b3c46ce70f91e997df9014e0a0c0;hb=b2b735205d9b6c57635a052c8d4af1329bfda723;hp=4c5efe0ee4787940ddd544c2ac83248a315055ca;hpb=e44b8496425b348e22165e767b3e8fa52dcad953;p=melted_gui

diff --git a/src/opts.c b/src/opts.c
index 4c5efe0..55b0d77 100644
--- a/src/opts.c
+++ b/src/opts.c
@@ -1,6 +1,6 @@
 /*
- * opts.c -- GTK+ 2 omnplay
- * Copyright (C) 2011 Maksym Veremeyenko <verem@m1stereo.tv>
+ * opts.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,19 +33,25 @@
 static const char short_options [] = "h";
 static const struct option long_options [] =
 {
-    { "directory",              required_argument,    NULL,   '0'},
-    { "player",                 required_argument,    NULL,   '1'},
+    { "host",                   required_argument,    NULL,   '0'},
+    { "unit",                   required_argument,    NULL,   '1'},
+    { "lib-port",               required_argument,    NULL,   '2'},
+    { "main-port",              required_argument,    NULL,   '3'},
     { "help",                   no_argument,          NULL,   'h'},
     { 0,                        0,                    0,      0}
 };
 
 
 
-int omnplay_opt(int argc, char** argv, omnplay_instance_t* app)
+int instance_opt(int argc, char** argv, instance_t* app)
 {
     char* p;
     int c, index = 0;
 
+    /* setup defaults */
+    app->players.port = 5250;
+    app->library.port = 5250;
+
     /* reset datas */
     optind = 0; opterr = 0; optopt = 0;
 
@@ -60,21 +66,27 @@ int omnplay_opt(int argc, char** argv, omnplay_instance_t* app)
         {
             case 0: break;
 
-            /** --direcotry */
+            /** --host */
             case '0':
-                strncpy(app->players.path, optarg, PATH_MAX);
+                strncpy(app->players.host, optarg, PATH_MAX);
                 break;
 
-            /** --player */
+            /** --unit */
             case '1':
-                p = strchr(optarg, '@');
-                if(p)
-                {
-                    *p = 0;
-                    strncpy(app->players.item[app->players.count].name, optarg, PATH_MAX);
-                    strncpy(app->players.item[app->players.count].host, p + 1, PATH_MAX);
-                    app->players.count++;
-                };
+                app->players.item[app->players.count].unit = atol(optarg);
+                app->players.item[app->players.count].idx = app->players.count;
+                app->players.item[app->players.count].app = app;
+                app->players.count++;
+                break;
+
+            /** --lib-port */
+            case '2':
+                app->library.port = atol(optarg);
+                break;
+
+            /** --main-port */
+            case '3':
+                app->players.port = atol(optarg);
                 break;
 
             default:
@@ -87,13 +99,15 @@ int omnplay_opt(int argc, char** argv, omnplay_instance_t* app)
     return 0;
 };
 
-void omnplay_usage(void)
+void instance_usage(void)
 {
     fprintf
     (
         stderr,
         "Usage:\n"
-        "\t--directory=<PATH> Directory to override default\n"
-        "\t--player=<STRING>  Player to use in a form <player_name>@<mediadirector host>\n"
+        "\t--host=<STRING>    Host name of melted server\n"
+        "\t--unit=<INT>       Player to use (e.g. unit number)\n"
+        "\t--main-port=<INT>  Melted instance ip port binded (default 5250), playback operations\n"
+        "\t--lib-port=<INT>   Melted instance ip port binded (default 5250), library operations\n"
     );
 };