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

Mixer: Don't die when not running under NSM.

This commit is contained in:
Jonathan Moore Liles 2012-02-23 19:00:13 -08:00
parent d93a2de86b
commit bc216741f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mixer/src/main.C
View File

@ -91,10 +91,10 @@ static void cb_main ( Fl_Double_Window *o, void *)
} }
void void
check_osc ( void * v ) check_nsm ( void * v )
{ {
nsm->check(); nsm->check();
Fl::repeat_timeout( OSC_INTERVAL, check_osc, v ); Fl::repeat_timeout( OSC_INTERVAL, check_nsm, v );
} }
static int got_sigterm = 0; static int got_sigterm = 0;
@ -233,6 +233,9 @@ main ( int argc, char **argv )
if ( ! nsm->init() ) if ( ! nsm->init() )
{ {
nsm->announce( nsm_url, APP_NAME, ":switch:dirty:", argv[0] ); nsm->announce( nsm_url, APP_NAME, ":switch:dirty:", argv[0] );
// poll so we can keep OSC handlers running in the GUI thread and avoid extra sync
Fl::add_timeout( OSC_INTERVAL, check_nsm, NULL );
} }
} }
else else
@ -249,9 +252,6 @@ main ( int argc, char **argv )
} }
} }
// poll so we can keep OSC handlers running in the GUI thread and avoid extra sync
Fl::add_timeout( OSC_INTERVAL, check_osc, NULL );
Fl::add_check( check_sigterm ); Fl::add_check( check_sigterm );
Fl::run(); Fl::run();