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

diff --git a/src/opts.c b/src/opts.c
index 4ae9206..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,24 +33,24 @@
 static const char short_options [] = "h";
 static const struct option long_options [] =
 {
-    { "directory",              required_argument,    NULL,   '0'},
-    { "player",                 required_argument,    NULL,   '1'},
-    { "library",                required_argument,    NULL,   '2'},
-    { "whois",                  required_argument,    NULL,   '3'},
-    { "id-display-rate",        required_argument,    NULL,   '4'},
+    { "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->library.id_display_rate = 20;
+    app->players.port = 5250;
+    app->library.port = 5250;
 
     /* reset datas */
     optind = 0; opterr = 0; optopt = 0;
@@ -66,38 +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.item[app->players.count].idx = app->players.count;
-                    app->players.item[app->players.count].app = app;
-                    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;
 
-            /** --library */
+            /** --lib-port */
             case '2':
-                strncpy(app->library.filename, optarg, PATH_MAX);
+                app->library.port = atol(optarg);
                 break;
 
-            /** --whois */
+            /** --main-port */
             case '3':
-                strncpy(app->library.whois, optarg, PATH_MAX);
-                break;
-
-            /** --id-display-rate */
-            case '4':
-                app->library.id_display_rate = atol(optarg);
+                app->players.port = atol(optarg);
                 break;
 
             default:
@@ -110,16 +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--whois=<URL>      Whois service URL\n"
-        "\t--library=<PATH>   File used for library storage\n"
-        "\t--id-display-rate=<NUM> Rate of id displaying during server content requesting\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"
     );
 };