summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/ingenuity/ConnectWindow.cpp16
-rw-r--r--src/progs/server/cmdline.c324
-rw-r--r--src/progs/server/cmdline.ggo5
-rw-r--r--src/progs/server/cmdline.h34
-rw-r--r--src/progs/server/main.cpp17
5 files changed, 337 insertions, 59 deletions
diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp
index c2c746bf..302cb08a 100644
--- a/src/progs/ingenuity/ConnectWindow.cpp
+++ b/src/progs/ingenuity/ConnectWindow.cpp
@@ -29,8 +29,9 @@
#include "App.h"
#include "WindowFactory.h"
#ifdef MONOLITHIC_INGENUITY
- #include "engine/QueuedEngineInterface.h"
#include "engine/Engine.h"
+ #include "engine/JackAudioDriver.h"
+ #include "engine/QueuedEngineInterface.h"
#include "engine/DirectResponder.h"
#include "engine/tuning.h"
#endif
@@ -169,16 +170,19 @@ ConnectWindow::connect()
#ifdef MONOLITHIC_INGENUITY
} else if (_mode == INTERNAL) {
SharedPtr<Ingen::Engine> engine(new Ingen::Engine());
- QueuedModelEngineInterface* qmei = new QueuedModelEngineInterface(engine);
- SharedPtr<ModelEngineInterface> engine_interface(qmei);
+ SharedPtr<Ingen::AudioDriver> audio_driver(
+ new Ingen::JackAudioDriver(*engine.get()) );
+ SharedPtr<QueuedModelEngineInterface> engine_interface(
+ new QueuedModelEngineInterface(engine) );
ThreadedSigClientInterface* tsci = new ThreadedSigClientInterface(Ingen::event_queue_size);
SharedPtr<SigClientInterface> client(tsci);
App::instance().attach(engine_interface, client);
- qmei->set_responder(SharedPtr<Ingen::Responder>(new Ingen::DirectResponder(client, 1)));
- engine->set_event_source(qmei);
-
+ engine_interface->set_responder(SharedPtr<Ingen::Responder>(new Ingen::DirectResponder(client, 1)));
+
+ engine->activate(audio_driver, engine_interface);
+
Glib::signal_timeout().connect(
sigc::mem_fun(engine.get(), &Ingen::Engine::main_iteration), 1000);
diff --git a/src/progs/server/cmdline.c b/src/progs/server/cmdline.c
index 6b7ddf6a..6a697a04 100644
--- a/src/progs/server/cmdline.c
+++ b/src/progs/server/cmdline.c
@@ -1,27 +1,83 @@
/*
- File autogenerated by gengetopt version 2.10
+ File autogenerated by gengetopt version 2.18
generated with the following command:
- gengetopt
+ gengetopt -u
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
we make no copyright claims on it.
*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/* If we use autoconf. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#include "getopt.h"
#include "cmdline.h"
+const char *gengetopt_args_info_purpose = "";
+
+const char *gengetopt_args_info_usage = "Usage: Om - An OSC controlled realtime modular synthesizer [OPTIONS]... [FILES]...";
+
+const char *gengetopt_args_info_help[] = {
+ " -h, --help Print help and exit",
+ " -V, --version Print version and exit",
+ " -p, --port=STRING OSC port to listen on (default=`16180')",
+ " -j, --jack-server=STRING Name of Jack server to attach to",
+ " -i, --in-jackd Run engine as in-process JACK client (default=off)",
+ 0
+};
+
+static
+void clear_given (struct gengetopt_args_info *args_info);
+static
+void clear_args (struct gengetopt_args_info *args_info);
+
+static int
+cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required, const char *additional_error);
+
+
+static char *
+gengetopt_strdup (const char *s);
+
+static
+void clear_given (struct gengetopt_args_info *args_info)
+{
+ args_info->help_given = 0 ;
+ args_info->version_given = 0 ;
+ args_info->port_given = 0 ;
+ args_info->jack_server_given = 0 ;
+ args_info->in_jackd_given = 0 ;
+}
+
+static
+void clear_args (struct gengetopt_args_info *args_info)
+{
+ args_info->port_arg = gengetopt_strdup ("16180");
+ args_info->port_orig = NULL;
+ args_info->jack_server_arg = NULL;
+ args_info->jack_server_orig = NULL;
+ args_info->in_jackd_flag = 0;
+
+}
+
+static
+void init_args_info(struct gengetopt_args_info *args_info)
+{
+ args_info->help_help = gengetopt_args_info_help[0] ;
+ args_info->version_help = gengetopt_args_info_help[1] ;
+ args_info->port_help = gengetopt_args_info_help[2] ;
+ args_info->jack_server_help = gengetopt_args_info_help[3] ;
+ args_info->in_jackd_help = gengetopt_args_info_help[4] ;
+
+}
+
void
cmdline_parser_print_version (void)
{
@@ -31,24 +87,124 @@ cmdline_parser_print_version (void)
void
cmdline_parser_print_help (void)
{
+ int i = 0;
cmdline_parser_print_version ();
- printf("\n"
- "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE);
- printf(" -h --help Print help and exit\n");
- printf(" -V --version Print version and exit\n");
- printf(" -pSTRING --port=STRING OSC port to listen on (default='16180')\n");
- printf(" -i --in-jackd Run engine as in-process JACK client (default=off)\n");
+
+ if (strlen(gengetopt_args_info_purpose) > 0)
+ printf("\n%s\n", gengetopt_args_info_purpose);
+
+ printf("\n%s\n\n", gengetopt_args_info_usage);
+ while (gengetopt_args_info_help[i])
+ printf("%s\n", gengetopt_args_info_help[i++]);
+}
+
+void
+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;
+}
+
+static void
+cmdline_parser_release (struct gengetopt_args_info *args_info)
+{
+
+ unsigned int i;
+ if (args_info->port_arg)
+ {
+ free (args_info->port_arg); /* free previous argument */
+ args_info->port_arg = 0;
+ }
+ if (args_info->port_orig)
+ {
+ free (args_info->port_orig); /* free previous argument */
+ args_info->port_orig = 0;
+ }
+ if (args_info->jack_server_arg)
+ {
+ free (args_info->jack_server_arg); /* free previous argument */
+ args_info->jack_server_arg = 0;
+ }
+ if (args_info->jack_server_orig)
+ {
+ free (args_info->jack_server_orig); /* free previous argument */
+ args_info->jack_server_orig = 0;
+ }
+
+ 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);
+}
+
+int
+cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_info)
+{
+ FILE *outfile;
+ int i = 0;
+
+ outfile = fopen(filename, "w");
+
+ if (!outfile)
+ {
+ fprintf (stderr, "%s: cannot open file for writing: %s\n", CMDLINE_PARSER_PACKAGE, filename);
+ return EXIT_FAILURE;
+ }
+
+ if (args_info->help_given) {
+ fprintf(outfile, "%s\n", "help");
+ }
+ if (args_info->version_given) {
+ fprintf(outfile, "%s\n", "version");
+ }
+ if (args_info->port_given) {
+ if (args_info->port_orig) {
+ fprintf(outfile, "%s=\"%s\"\n", "port", args_info->port_orig);
+ } else {
+ fprintf(outfile, "%s\n", "port");
+ }
+ }
+ if (args_info->jack_server_given) {
+ if (args_info->jack_server_orig) {
+ fprintf(outfile, "%s=\"%s\"\n", "jack-server", args_info->jack_server_orig);
+ } else {
+ fprintf(outfile, "%s\n", "jack-server");
+ }
+ }
+ if (args_info->in_jackd_given) {
+ fprintf(outfile, "%s\n", "in-jackd");
+ }
+
+ fclose (outfile);
+
+ i = EXIT_SUCCESS;
+ return i;
}
+void
+cmdline_parser_free (struct gengetopt_args_info *args_info)
+{
+ cmdline_parser_release (args_info);
+}
-static char *gengetopt_strdup (const char *s);
/* gengetopt_strdup() */
/* strdup.c replacement of strdup, which is not standard */
char *
gengetopt_strdup (const char *s)
{
- char *result = (char*)malloc(strlen(s) + 1);
+ char *result = NULL;
+ if (!s)
+ return result;
+
+ result = (char*)malloc(strlen(s) + 1);
if (result == (char*)0)
return (char*)0;
strcpy(result, s);
@@ -58,22 +214,46 @@ gengetopt_strdup (const char *s)
int
cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info)
{
- int c; /* Character of the parsed option. */
- int missing_required_options = 0;
+ return cmdline_parser2 (argc, argv, args_info, 0, 1, 1);
+}
- args_info->help_given = 0 ;
- args_info->version_given = 0 ;
- args_info->port_given = 0 ;
- args_info->in_jackd_given = 0 ;
-#define clear_args() { \
- args_info->port_arg = gengetopt_strdup("16180") ;\
- args_info->in_jackd_flag = 0;\
+int
+cmdline_parser2 (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required)
+{
+ int result;
+
+ result = cmdline_parser_internal (argc, argv, args_info, override, initialize, check_required, NULL);
+
+ if (result == EXIT_FAILURE)
+ {
+ cmdline_parser_free (args_info);
+ exit (EXIT_FAILURE);
+ }
+
+ return result;
+}
+
+int
+cmdline_parser_required (struct gengetopt_args_info *args_info, const char *prog_name)
+{
+ return EXIT_SUCCESS;
}
- clear_args();
+int
+cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required, const char *additional_error)
+{
+ int c; /* Character of the parsed option. */
+
+ int error = 0;
+ struct gengetopt_args_info local_args_info;
+
+ if (initialize)
+ cmdline_parser_init (args_info);
+
+ cmdline_parser_init (&local_args_info);
optarg = 0;
- optind = 1;
+ optind = 0;
opterr = 1;
optopt = '?';
@@ -86,65 +266,125 @@ cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_i
{ "help", 0, NULL, 'h' },
{ "version", 0, NULL, 'V' },
{ "port", 1, NULL, 'p' },
+ { "jack-server", 1, NULL, 'j' },
{ "in-jackd", 0, NULL, 'i' },
{ NULL, 0, NULL, 0 }
};
stop_char = 0;
- c = getopt_long (argc, argv, "hVp:i", long_options, &option_index);
+ c = getopt_long (argc, argv, "hVp:j:i", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
switch (c)
{
case 'h': /* Print help and exit. */
- clear_args ();
cmdline_parser_print_help ();
+ cmdline_parser_free (&local_args_info);
exit (EXIT_SUCCESS);
case 'V': /* Print version and exit. */
- clear_args ();
cmdline_parser_print_version ();
+ cmdline_parser_free (&local_args_info);
exit (EXIT_SUCCESS);
case 'p': /* OSC port to listen on. */
- if (args_info->port_given)
+ if (local_args_info.port_given)
{
- fprintf (stderr, "%s: `--port' (`-p') option given more than once\n", CMDLINE_PARSER_PACKAGE);
- clear_args ();
- exit (EXIT_FAILURE);
+ fprintf (stderr, "%s: `--port' (`-p') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
+ goto failure;
}
+ if (args_info->port_given && ! override)
+ continue;
+ local_args_info.port_given = 1;
args_info->port_given = 1;
+ if (args_info->port_arg)
+ free (args_info->port_arg); /* free previous string */
args_info->port_arg = gengetopt_strdup (optarg);
+ if (args_info->port_orig)
+ free (args_info->port_orig); /* free previous string */
+ args_info->port_orig = gengetopt_strdup (optarg);
+ break;
+
+ case 'j': /* Name of Jack server to attach to. */
+ if (local_args_info.jack_server_given)
+ {
+ fprintf (stderr, "%s: `--jack-server' (`-j') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
+ goto failure;
+ }
+ if (args_info->jack_server_given && ! override)
+ continue;
+ local_args_info.jack_server_given = 1;
+ args_info->jack_server_given = 1;
+ if (args_info->jack_server_arg)
+ free (args_info->jack_server_arg); /* free previous string */
+ args_info->jack_server_arg = gengetopt_strdup (optarg);
+ if (args_info->jack_server_orig)
+ free (args_info->jack_server_orig); /* free previous string */
+ args_info->jack_server_orig = gengetopt_strdup (optarg);
break;
case 'i': /* Run engine as in-process JACK client. */
- if (args_info->in_jackd_given)
+ if (local_args_info.in_jackd_given)
{
- fprintf (stderr, "%s: `--in-jackd' (`-i') option given more than once\n", CMDLINE_PARSER_PACKAGE);
- clear_args ();
- exit (EXIT_FAILURE);
+ fprintf (stderr, "%s: `--in-jackd' (`-i') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
+ goto failure;
}
+ if (args_info->in_jackd_given && ! override)
+ continue;
+ local_args_info.in_jackd_given = 1;
args_info->in_jackd_given = 1;
args_info->in_jackd_flag = !(args_info->in_jackd_flag);
break;
case 0: /* Long option with no short option */
-
case '?': /* Invalid option. */
/* `getopt_long' already printed an error message. */
- exit (EXIT_FAILURE);
+ goto failure;
default: /* bug: option not considered. */
- fprintf (stderr, "%s: option unknown: %c\n", CMDLINE_PARSER_PACKAGE, c);
+ fprintf (stderr, "%s: option unknown: %c%s\n", CMDLINE_PARSER_PACKAGE, c, (additional_error ? additional_error : ""));
abort ();
} /* switch */
} /* while */
- if ( missing_required_options )
- exit (EXIT_FAILURE);
+
+
+ cmdline_parser_release (&local_args_info);
+
+ 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:
+
+ cmdline_parser_release (&local_args_info);
+ return (EXIT_FAILURE);
}
diff --git a/src/progs/server/cmdline.ggo b/src/progs/server/cmdline.ggo
index 8c006ca7..ce50cea1 100644
--- a/src/progs/server/cmdline.ggo
+++ b/src/progs/server/cmdline.ggo
@@ -2,6 +2,7 @@
package "Om - An OSC controlled realtime modular synthesizer"
-option "port" p "OSC port to listen on" string default="16180" no
-option "in-jackd" i "Run engine as in-process JACK client" flag off
+option "port" p "OSC port to listen on" string default="16180" no
+option "jack-server" j "Name of Jack server to attach to" string no
+option "in-jackd" i "Run engine as in-process JACK client" flag off
diff --git a/src/progs/server/cmdline.h b/src/progs/server/cmdline.h
index fe36a969..8ced9534 100644
--- a/src/progs/server/cmdline.h
+++ b/src/progs/server/cmdline.h
@@ -1,6 +1,6 @@
/* cmdline.h */
-/* File autogenerated by gengetopt version 2.10 */
+/* File autogenerated by gengetopt version 2.18 */
#ifndef CMDLINE_H
#define CMDLINE_H
@@ -24,21 +24,49 @@ extern "C" {
struct gengetopt_args_info
{
+ const char *help_help; /* Print help and exit help description. */
+ const char *version_help; /* Print version and exit help description. */
char * port_arg; /* OSC port to listen on (default='16180'). */
+ char * port_orig; /* OSC port to listen on original value given at command line. */
+ const char *port_help; /* OSC port to listen on help description. */
+ char * jack_server_arg; /* Name of Jack server to attach to. */
+ char * jack_server_orig; /* Name of Jack server to attach to original value given at command line. */
+ const char *jack_server_help; /* Name of Jack server to attach to help description. */
int in_jackd_flag; /* Run engine as in-process JACK client (default=off). */
-
+ const char *in_jackd_help; /* Run engine as in-process JACK client help description. */
+
int help_given ; /* Whether help was given. */
int version_given ; /* Whether version was given. */
int port_given ; /* Whether port was given. */
+ int jack_server_given ; /* Whether jack-server was given. */
int in_jackd_given ; /* Whether in-jackd was given. */
+ char **inputs ; /* unamed options */
+ unsigned inputs_num ; /* unamed options number */
} ;
-int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info);
+extern const char *gengetopt_args_info_purpose;
+extern const char *gengetopt_args_info_usage;
+extern const char *gengetopt_args_info_help[];
+
+int cmdline_parser (int argc, char * const *argv,
+ struct gengetopt_args_info *args_info);
+int cmdline_parser2 (int argc, char * const *argv,
+ struct gengetopt_args_info *args_info,
+ int override, int initialize, int check_required);
+int cmdline_parser_file_save(const char *filename,
+ struct gengetopt_args_info *args_info);
void cmdline_parser_print_help(void);
void cmdline_parser_print_version(void);
+void cmdline_parser_init (struct gengetopt_args_info *args_info);
+void cmdline_parser_free (struct gengetopt_args_info *args_info);
+
+int cmdline_parser_required (struct gengetopt_args_info *args_info,
+ const char *prog_name);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp
index fa3548d3..73603e3a 100644
--- a/src/progs/server/main.cpp
+++ b/src/progs/server/main.cpp
@@ -22,6 +22,7 @@
#include "cmdline.h"
#include "tuning.h"
#include "Engine.h"
+#include "JackAudioDriver.h"
#include "OSCEngineReceiver.h"
#ifdef HAVE_LASH
#include "LashDriver.h"
@@ -139,11 +140,16 @@ main(int argc, char** argv)
engine = SharedPtr<Engine>(new Engine());
- OSCEngineReceiver* receiver = new OSCEngineReceiver(
- engine, pre_processor_queue_size, args_info.port_arg);
+ std::string jack_name
+ = (args_info.jack_server_given) ? args_info.jack_server_arg : "";
- receiver->activate();
- engine->set_event_source(receiver);
+ SharedPtr<AudioDriver> audio_driver(
+ new JackAudioDriver(*engine.get(), jack_name) );
+
+ SharedPtr<EventSource> event_source(new OSCEngineReceiver(
+ engine, pre_processor_queue_size, args_info.port_arg ));
+
+ engine->activate(audio_driver, event_source);
#ifdef HAVE_LASH
lash_driver = new LashDriver(engine, lash_args);
@@ -151,13 +157,12 @@ main(int argc, char** argv)
engine->main();
- receiver->deactivate();
+ event_source->deactivate();
#ifdef HAVE_LASH
delete lash_driver;
#endif
- delete receiver;
}
return ret;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 15:05:16 +0000