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

Merge ec5b3d604a into cdad26211b

pull/246/merge
Rik Berkelder 2021-02-01 20:12:47 -05:00 committed by GitHub
parent cdad26211b ec5b3d604a
commit 2fcdc0b558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
session-manager/src/nsmd.C
View File

@ -2214,6 +2214,7 @@ int main(int argc, char *argv[])
// char *osc_port = "6666";
char *osc_port = NULL;
const char *gui_url = NULL;
const char *load_session = NULL;
static struct option long_options[] =
{
@ -2222,6 +2223,7 @@ int main(int argc, char *argv[])
{ "osc-port", required_argument, 0, 'p' },
{ "gui-url", required_argument, 0, 'g' },
{ "help", no_argument, 0, 'h' },
{ "load-session", required_argument, 0, 'l'},
{ 0, 0, 0, 0 }
};
@ -2255,8 +2257,12 @@ int main(int argc, char *argv[])
DMESSAGE( "Going to connect to GUI at: %s", optarg );
gui_url = optarg;
break;
case 'l':
DMESSAGE( "Using session file %s", optarg);
load_session = optarg;
break;
case 'h':
printf( "Usage: %s [--osc-port portnum] [--session-root path]\n\n", argv[0] );
printf( "Usage: %s [--osc-port portnum] [--session-root path] [--load-session session-name]\n\n", argv[0] );
exit(0);
break;
}
@ -2330,6 +2336,15 @@ int main(int argc, char *argv[])
osc_server->add_method( NULL, NULL, OSC_NAME( null ),NULL, "" );
if ( load_session )
{
char *spath;
asprintf( &spath, "%s/%s", session_root, load_session);
MESSAGE( "LOAD SESSION %s", spath);
load_session_file( spath );
}
if ( detach )
{
MESSAGE( "Detaching from console" );