Browse Source

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

tags/non-daw-v1.1.0
Jonathan Moore Liles 13 years ago
parent
commit
bc216741f4
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      mixer/src/main.C

+ 5
- 5
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();


Loading…
Cancel
Save