summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/ingen/Makefile.am2
-rw-r--r--src/progs/ingen/cmdline.c45
-rw-r--r--src/progs/ingen/cmdline.ggo1
-rw-r--r--src/progs/ingen/cmdline.h6
-rw-r--r--src/progs/ingen/main.cpp32
5 files changed, 79 insertions, 7 deletions
diff --git a/src/progs/ingen/Makefile.am b/src/progs/ingen/Makefile.am
index ff408ab2..2a471c73 100644
--- a/src/progs/ingen/Makefile.am
+++ b/src/progs/ingen/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/ingen/src/libs -DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
+AM_CXXFLAGS = @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/ingen/src/libs -I$(top_srcdir)/ingen/src -DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/progs/ingen/cmdline.c b/src/progs/ingen/cmdline.c
index 6c37d78e..462c6a3e 100644
--- a/src/progs/ingen/cmdline.c
+++ b/src/progs/ingen/cmdline.c
@@ -1,5 +1,5 @@
/*
- File autogenerated by gengetopt version 2.19.1
+ File autogenerated by gengetopt version 2.20
generated with the following command:
gengetopt
@@ -37,6 +37,7 @@ const char *gengetopt_args_info_help[] = {
" -C, --client-port=INT Client OSC port",
" -l, --load=STRING Load patch",
" -p, --path=STRING Target path for loaded patch",
+ " -r, --run=STRING Run script",
0
};
@@ -64,6 +65,7 @@ void clear_given (struct gengetopt_args_info *args_info)
args_info->client_port_given = 0 ;
args_info->load_given = 0 ;
args_info->path_given = 0 ;
+ args_info->run_given = 0 ;
}
static
@@ -80,6 +82,8 @@ void clear_args (struct gengetopt_args_info *args_info)
args_info->load_orig = NULL;
args_info->path_arg = NULL;
args_info->path_orig = NULL;
+ args_info->run_arg = NULL;
+ args_info->run_orig = NULL;
}
@@ -95,6 +99,7 @@ void init_args_info(struct gengetopt_args_info *args_info)
args_info->client_port_help = gengetopt_args_info_help[6] ;
args_info->load_help = gengetopt_args_info_help[7] ;
args_info->path_help = gengetopt_args_info_help[8] ;
+ args_info->run_help = gengetopt_args_info_help[9] ;
}
@@ -174,6 +179,16 @@ cmdline_parser_release (struct gengetopt_args_info *args_info)
free (args_info->path_orig); /* free previous argument */
args_info->path_orig = 0;
}
+ if (args_info->run_arg)
+ {
+ free (args_info->run_arg); /* free previous argument */
+ args_info->run_arg = 0;
+ }
+ if (args_info->run_orig)
+ {
+ free (args_info->run_orig); /* free previous argument */
+ args_info->run_orig = 0;
+ }
clear_given (args_info);
}
@@ -239,6 +254,13 @@ cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_
fprintf(outfile, "%s\n", "path");
}
}
+ if (args_info->run_given) {
+ if (args_info->run_orig) {
+ fprintf(outfile, "%s=\"%s\"\n", "run", args_info->run_orig);
+ } else {
+ fprintf(outfile, "%s\n", "run");
+ }
+ }
fclose (outfile);
@@ -330,11 +352,12 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
{ "client-port", 1, NULL, 'C' },
{ "load", 1, NULL, 'l' },
{ "path", 1, NULL, 'p' },
+ { "run", 1, NULL, 'r' },
{ NULL, 0, NULL, 0 }
};
stop_char = 0;
- c = getopt_long (argc, argv, "hVeE:c:gC:l:p:", long_options, &option_index);
+ c = getopt_long (argc, argv, "hVeE:c:gC:l:p:r:", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
@@ -470,6 +493,24 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
args_info->path_orig = gengetopt_strdup (optarg);
break;
+ case 'r': /* Run script. */
+ if (local_args_info.run_given)
+ {
+ fprintf (stderr, "%s: `--run' (`-r') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
+ goto failure;
+ }
+ if (args_info->run_given && ! override)
+ continue;
+ local_args_info.run_given = 1;
+ args_info->run_given = 1;
+ if (args_info->run_arg)
+ free (args_info->run_arg); /* free previous string */
+ args_info->run_arg = gengetopt_strdup (optarg);
+ if (args_info->run_orig)
+ free (args_info->run_orig); /* free previous string */
+ args_info->run_orig = gengetopt_strdup (optarg);
+ break;
+
case 0: /* Long option with no short option */
case '?': /* Invalid option. */
diff --git a/src/progs/ingen/cmdline.ggo b/src/progs/ingen/cmdline.ggo
index 45eae5b0..f844fa2d 100644
--- a/src/progs/ingen/cmdline.ggo
+++ b/src/progs/ingen/cmdline.ggo
@@ -16,4 +16,5 @@ option "gui" g "Launch the GTK graphical interface" flag on
option "client-port" C "Client OSC port" int no
option "load" l "Load patch" string no
option "path" p "Target path for loaded patch" string no
+option "run" r "Run script" string no
diff --git a/src/progs/ingen/cmdline.h b/src/progs/ingen/cmdline.h
index 6f1f9259..d96f5adb 100644
--- a/src/progs/ingen/cmdline.h
+++ b/src/progs/ingen/cmdline.h
@@ -1,6 +1,6 @@
/* cmdline.h */
-/* File autogenerated by gengetopt version 2.19.1 */
+/* File autogenerated by gengetopt version 2.20 */
#ifndef CMDLINE_H
#define CMDLINE_H
@@ -45,6 +45,9 @@ struct gengetopt_args_info
char * path_arg; /* Target path for loaded patch. */
char * path_orig; /* Target path for loaded patch original value given at command line. */
const char *path_help; /* Target path for loaded patch help description. */
+ char * run_arg; /* Run script. */
+ char * run_orig; /* Run script original value given at command line. */
+ const char *run_help; /* Run script help description. */
int help_given ; /* Whether help was given. */
int version_given ; /* Whether version was given. */
@@ -55,6 +58,7 @@ struct gengetopt_args_info
int client_port_given ; /* Whether client-port was given. */
int load_given ; /* Whether load was given. */
int path_given ; /* Whether path was given. */
+ int run_given ; /* Whether run was given. */
} ;
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp
index eff265c6..145ec463 100644
--- a/src/progs/ingen/main.cpp
+++ b/src/progs/ingen/main.cpp
@@ -19,8 +19,10 @@
#include <iostream>
#include <string>
#include <signal.h>
+#include <dlfcn.h>
#include <glibmm/convert.h>
#include <glibmm/miscutils.h>
+#include <glibmm/spawn.h>
#include <boost/optional.hpp>
#include <glibmm/thread.h>
#include <raul/Path.hpp>
@@ -30,13 +32,14 @@
#include "engine/Engine.hpp"
#include "engine/QueuedEngineInterface.hpp"
#include "serialisation/Loader.hpp"
+#include "bindings/ingen_bindings.hpp"
#include "cmdline.h"
using namespace std;
using namespace Ingen;
-SharedPtr<Engine> engine;
+SharedPtr<Engine> engine;
void
catch_int(int)
@@ -48,7 +51,6 @@ catch_int(int)
engine->quit();
}
-
int
main(int argc, char** argv)
{
@@ -69,6 +71,7 @@ main(int argc, char** argv)
SharedPtr<Glib::Module> engine_module;
SharedPtr<Glib::Module> client_module;
SharedPtr<Glib::Module> gui_module;
+ SharedPtr<Glib::Module> bindings_module;
SharedPtr<Shared::EngineInterface> engine_interface;
@@ -118,8 +121,9 @@ main(int argc, char** argv)
}
/* Load queued (direct in-process) engine interface */
- if (engine && !engine_interface && (args.load_given || args.gui_given))
+ if (engine && !engine_interface && (args.load_given || args.gui_given || args.run_given)) {
engine_interface = engine->new_queued_interface();
+ }
if (engine && engine_interface) {
@@ -130,6 +134,8 @@ main(int argc, char** argv)
engine->activate();
}
+
+ world->engine = engine_interface.get();
/* Load a patch */
if (args.load_given && engine_interface) {
@@ -193,6 +199,26 @@ main(int argc, char** argv)
}
}
+ /* Run a script */
+ if (args.run_given) {
+ bool (*run_script)(Ingen::Shared::World*, const char*) = NULL;
+ SharedPtr<Glib::Module> bindings_module = Ingen::Shared::load_module("ingen_bindings");
+ if (!bindings_module)
+ cerr << Glib::Module::get_last_error() << endl;
+
+ bindings_module->make_resident();
+
+ bool found = bindings_module->get_symbol("run", (void*&)(run_script));
+ if (found) {
+ cerr << "WORLD: " << world << endl;
+ cerr << "ENGINE: " << world->engine << endl;
+ setenv("PYTHONPATH", "../../bindings", 1);
+ run_script(world, args.run_arg);
+ } else {
+ cerr << "FAILED: " << Glib::Module::get_last_error() << endl;
+ }
+ }
+
/* Didn't run the GUI, listen to OSC and do our own main thing. */
if (engine && !ran_gui) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 20:10:51 +0000