Move patch to /patch via HTTP to give a place for RESTful access to other things.

Implement HTTP access to plugins.
Work towards client being able to use HTTP to connect.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1712 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 11 insertions, 45 deletions

diff --git a/src/ingen/cmdline.c b/src/ingen/cmdline.c
index e8a6ab63..c9e65f5f 100644
--- a/src/ingen/cmdline.c
+++ b/src/ingen/cmdline.c
@@ -1,7 +1,7 @@
 /*
-  File autogenerated by gengetopt version 2.22.1
+  File autogenerated by gengetopt 
   generated with the following command:
-  gengetopt -u 
+  gengetopt -g 
 
   The developers of gengetopt consider the fixed text that goes in all
   gengetopt output files to be in the public domain:
@@ -23,7 +23,7 @@
 
 const char *gengetopt_args_info_purpose = "A modular realtime audio processing system";
 
-const char *gengetopt_args_info_usage = "Usage: ingen [OPTIONS]... [FILES]...";
+const char *gengetopt_args_info_usage = "Usage: ingen [OPTIONS]...";
 
 const char *gengetopt_args_info_description = "Ingen can be run in various configurations. The engine can\nrun as a stand-alone server controlled by OSC, or internal to\nanother process (e.g. the GUI).  The GUI can communicate with the engine\nvia either method, and many GUIs (or other things) may connect to an\nengine via OSC.\n\nExamples:\n\n  ingen -e                     - Run an engine, listen for OSC           \n  ingen -g                     - Run a GUI, connect via OSC            \n  ingen -eg                    - Run an engine and a GUI in one process\n\nThe -l (load) option can be used in all cases:\n	\n  ingen -el patch.ingen.ttl    - Run an engine and load a patch\n  ingen -gl patch.ingen.ttl    - Run a GUI and load a patch\n  ingen -egl patch.ingen.ttl   - Run an engine and a GUI and load a patch\n\nOptions:\n";
 
@@ -31,7 +31,7 @@ const char *gengetopt_args_info_help[] = {
   "  -h, --help              Print help and exit",
   "  -V, --version           Print version and exit",
   "  -C, --client-port=INT   Client OSC port",
-  "  -c, --connect=STRING    Connect to existing engine at OSC URI  \n                            (default=`osc.udp://localhost:16180')",
+  "  -c, --connect=STRING    Connect to existing engine at URI  \n                            (default=`osc.udp://localhost:16180')",
   "  -e, --engine            Run (JACK) engine  (default=off)",
   "  -E, --engine-port=INT   Engine OSC port  (default=`16180')",
   "  -g, --gui               Launch the GTK graphical interface  (default=off)",
@@ -158,9 +158,6 @@ cmdline_parser_init (struct gengetopt_args_info *args_info)
   clear_given (args_info);
   clear_args (args_info);
   init_args_info (args_info);
-
-  args_info->inputs = NULL;
-  args_info->inputs_num = 0;
 }
 
 void
@@ -199,7 +196,7 @@ free_string_field (char **s)
 static void
 cmdline_parser_release (struct gengetopt_args_info *args_info)
 {
-  unsigned int i;
+
   free_string_field (&(args_info->client_port_orig));
   free_string_field (&(args_info->connect_arg));
   free_string_field (&(args_info->connect_orig));
@@ -215,11 +212,6 @@ cmdline_parser_release (struct gengetopt_args_info *args_info)
   free_string_field (&(args_info->run_orig));
   
   
-  for (i = 0; i < args_info->inputs_num; ++i)
-    free (args_info->inputs [i]);
-
-  if (args_info->inputs_num)
-    free (args_info->inputs);
 
   clear_given (args_info);
 }
@@ -562,7 +554,7 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
             goto failure;
         
           break;
-        case 'c':	/* Connect to existing engine at OSC URI.  */
+        case 'c':	/* Connect to existing engine at URI.  */
         
         
           if (update_arg( (void *)&(args_info->connect_arg), 
@@ -686,30 +678,6 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
   if ( error )
     return (EXIT_FAILURE);
 
-  if (optind < argc)
-    {
-      int i = 0 ;
-      int found_prog_name = 0;
-      /* whether program name, i.e., argv[0], is in the remaining args
-         (this may happen with some implementations of getopt,
-          but surely not with the one included by gengetopt) */
-
-      i = optind;
-      while (i < argc)
-        if (argv[i++] == argv[0]) {
-          found_prog_name = 1;
-          break;
-        }
-      i = 0;
-
-      args_info->inputs_num = argc - optind - found_prog_name;
-      args_info->inputs =
-        (char **)(malloc ((args_info->inputs_num)*sizeof(char *))) ;
-      while (optind < argc)
-        if (argv[optind++] != argv[0])
-          args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind-1]) ;
-    }
-
   return 0;
 
 failure:
diff --git a/src/ingen/cmdline.ggo b/src/ingen/cmdline.ggo
index f639cd98..11a56455 100644
--- a/src/ingen/cmdline.ggo
+++ b/src/ingen/cmdline.ggo
@@ -25,7 +25,7 @@ Options:
 "
 
 option "client-port" C "Client OSC port"    int    no
-option "connect" c "Connect to existing engine at OSC URI" string no default="osc.udp://localhost:16180"
+option "connect" c "Connect to existing engine at URI" string no default="osc.udp://localhost:16180"
 option "engine" e "Run (JACK) engine" flag off
 option "engine-port" E "Engine OSC port"    int    no default="16180"
 option "gui" g "Launch the GTK graphical interface" flag off
diff --git a/src/ingen/cmdline.h b/src/ingen/cmdline.h
index ee916423..8777d391 100644
--- a/src/ingen/cmdline.h
+++ b/src/ingen/cmdline.h
@@ -1,6 +1,6 @@
 /** @file cmdline.h
  *  @brief The header file for the command line option parser
- *  generated by GNU Gengetopt version 2.22.1
+ *  generated by GNU Gengetopt 
  *  http://www.gnu.org/software/gengetopt.
  *  DO NOT modify this file, since it can be overwritten
  *  @author GNU Gengetopt by Lorenzo Bettini */
@@ -37,9 +37,9 @@ struct gengetopt_args_info
   int client_port_arg;	/**< @brief Client OSC port.  */
   char * client_port_orig;	/**< @brief Client OSC port original value given at command line.  */
   const char *client_port_help; /**< @brief Client OSC port help description.  */
-  char * connect_arg;	/**< @brief Connect to existing engine at OSC URI (default='osc.udp://localhost:16180').  */
-  char * connect_orig;	/**< @brief Connect to existing engine at OSC URI original value given at command line.  */
-  const char *connect_help; /**< @brief Connect to existing engine at OSC URI help description.  */
+  char * connect_arg;	/**< @brief Connect to existing engine at URI (default='osc.udp://localhost:16180').  */
+  char * connect_orig;	/**< @brief Connect to existing engine at URI original value given at command line.  */
+  const char *connect_help; /**< @brief Connect to existing engine at URI help description.  */
   int engine_flag;	/**< @brief Run (JACK) engine (default=off).  */
   const char *engine_help; /**< @brief Run (JACK) engine help description.  */
   int engine_port_arg;	/**< @brief Engine OSC port (default='16180').  */
@@ -76,8 +76,6 @@ struct gengetopt_args_info
   unsigned int path_given ;	/**< @brief Whether path was given.  */
   unsigned int run_given ;	/**< @brief Whether run was given.  */
 
-  char **inputs ; /**< @brief unamed options (options without names) */
-  unsigned inputs_num ; /**< @brief unamed options number */
 } ;
 
 /** @brief The additional parameters to pass to parser functions */