mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mixer: Improve commandline handling.

pull/3/head
Jonathan Moore Liles 2012-03-04 18:57:00 -08:00
parent 676a98c17e
commit 2d5072c7d7
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mixer/src/Plugin_Module.C
View File

@ -290,6 +290,12 @@ Plugin_Module::spawn_discover_thread ( void )
plugin_discover_thread->clone( &Plugin_Module::discover_thread, NULL );
}
void
Plugin_Module::join_discover_thread ( void )
{
plugin_discover_thread->join();
}
/* return a list of available plugins */
Plugin_Module::Plugin_Info *
Plugin_Module::get_all_plugins ( void )

1
mixer/src/Plugin_Module.H
View File

@ -91,6 +91,7 @@ private:
public:
static void spawn_discover_thread ( void );
static void join_discover_thread ( void );
Plugin_Module ( );
virtual ~Plugin_Module();

3
mixer/src/Project.C
View File

@ -309,7 +309,10 @@ Project::create ( const char *name, const char *template_name )
}
if ( chdir( name ) )
{
FATAL( "WTF? Cannot change to new project directory" );
return false;
}
// mkdir( "sources", 0777 );
creat( "snapshot", 0666 );

18
mixer/src/main.C
View File

@ -70,6 +70,8 @@
const double NSM_CHECK_INTERVAL = 0.25f;
const char COPYRIGHT[] = "Copyright (c) 2008-2012 Jonathan Moore Liles";
char *user_config_dir;
Mixer *mixer;
NSM_Client *nsm;
@ -128,6 +130,8 @@ int
main ( int argc, char **argv )
{
printf( "%s %s %s -- %s\n", APP_TITLE, VERSION, "", COPYRIGHT );
#ifdef HAVE_XPM
fl_open_display();
Pixmap p, mask;
@ -174,8 +178,6 @@ main ( int argc, char **argv )
Fl::lock();
Plugin_Module::spawn_discover_thread();
Fl_Double_Window *main_window;
{
@ -198,7 +200,7 @@ main ( int argc, char **argv )
#ifdef HAVE_XPM
o->icon((char *)p);
#endif
o->show( argc, argv );
o->show( 0, 0 );
}
const char *osc_port = NULL;
@ -210,6 +212,7 @@ main ( int argc, char **argv )
static struct option long_options[] =
{
{ "help", no_argument, 0, '?' },
{ "instance", required_argument, 0, 'i' },
{ "osc-port", required_argument, 0, 'p' },
{ 0, 0, 0, 0 }
@ -234,12 +237,14 @@ main ( int argc, char **argv )
instance_override = true;
break;
case '?':
printf( "Usage: %s [--osc-port portnum]\n\n", argv[0] );
printf( "\nUsage: %s [--instance instance_name] [--osc-port portnum] [path_to_project]\n\n", argv[0] );
exit(0);
break;
}
}
Plugin_Module::spawn_discover_thread();
mixer->init_osc( osc_port );
char *nsm_url = getenv( "NSM_URL" );
@ -264,6 +269,9 @@ main ( int argc, char **argv )
{
if ( optind < argc )
{
MESSAGE( "Waiting for plugins..." );
Plugin_Module::join_discover_thread();
MESSAGE( "Loading \"%s\"", argv[optind] );
if ( ! mixer->command_load( argv[optind] ) )
@ -272,7 +280,7 @@ main ( int argc, char **argv )
}
}
}
Fl::add_check( check_sigterm );
Fl::run();