daemon mode now keeps Csound open indefinitely regardless of the scor…

…e end
csound · Dec 18, 2017 · 96ad277 · 96ad277
1 parent b5c6a58
commit 96ad277
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/Bela/BelaCsound.cpp b/Bela/BelaCsound.cpp
@@ -58,7 +58,7 @@ void render(BelaContext *context, void *Data)
     /* this is where Csound is called */
     for(n = 0; n < context->audioFrames; n++){
       if(frame == blocksize) {
-	if((res = userData->csound->PerformBuffer()) == 0) j = 0;
+	if((res = userData->csound->PerformBuffer()) == 0) frame = 0;
 	else {
 	  frame = -1;
 	  break;

diff --git a/Bela/main.cpp b/Bela/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, const char *argv[]) {
 			{NULL, 0, NULL, 0}};
   BelaInitSettings settings;
   Bela_defaultSettings(&settings);
-  if(Bela_getopt_long(argc, argv, "", opt, &settings) == 0) {
+  if(Bela_getopt_long(argc, argv, "", opt, &settings) != -1) {
     csData.csd = new char[strlen(optarg)+1];
     std::strcpy(csData.csd,optarg);
     bool res = Bela_initAudio(&settings, &CsData);
@@ -81,7 +81,7 @@ void render(BelaContext *context, void *userData)
     /* this is where Csound is called */
     for(n = 0; n < context->audioFrames; n++){
       if(frame == blocksize) {
-	if((res = userData->csound->PerformBuffer()) == 0) j = 0;
+	if((res = userData->csound->PerformBuffer()) == 0) frame = 0;
 	else {
 	  frame = -1;
 	  break;

diff --git a/Engine/musmon.c b/Engine/musmon.c
@@ -975,9 +975,14 @@ int sensevents(CSOUND *csound)
     else                                  /* this should only happen at */
       csound->cyclesRemaining = 0;        /* beginning of performance   */
   }
-    
+
  retest:
-  while (csound->cyclesRemaining <= 0) {   /* read each score event:     */
+  /* in daemon mode, we will ignore the end of
+     the score, but allow for a realtime event 
+     to stop Csound */
+    while (csound->cyclesRemaining <= 0 &&
+           (e->opcod != 'e' || !csound->oparms->daemon)){
+      /* read each score event:     */
     if (e->opcod != '\0') {
       /* if there is a pending score event, handle it now */
       switch (e->opcod) {
@@ -1016,9 +1021,12 @@ int sensevents(CSOUND *csound)
 	else                                /* else lcode   */
 	  memcpy((void*) e, (void*) &(STA(lsect)->strarg), sizeof(EVTBLK));
       } else
-	if (!(rdscor(csound, e)))           /* or rd nxt evt from scstr */
+	if (!(rdscor(csound, e))){
+	  /* or rd nxt evt from scstr */
 	  e->opcod = 'e';
+	}
       csound->currevent = e;
+
       switch (e->opcod) {
       case 'w':
 	if (!O->Beatmode)                   /* Not beatmode: read 'w' */
@@ -1048,7 +1056,6 @@ int sensevents(CSOUND *csound)
 	continue;
       }
     }
-
     /* calculate the number of k-periods remaining until next event */
     if (!O->sampleAccurate) {
       if (O->Beatmode)
@@ -1098,8 +1105,9 @@ int sensevents(CSOUND *csound)
 	   csound->OrcTrigEvts->start_kcnt <=
 	   (uint32) csound->global_kcounter) {
 
-      if ((retval = process_rt_event(csound, 4)) != 0) 
+      if ((retval = process_rt_event(csound, 4)) != 0){
 	goto scode;
+      }
     }
     /* RM */
     if ((sinp = getRemoteSocksIn(csound))) {
@@ -1142,18 +1150,18 @@ int sensevents(CSOUND *csound)
 	}
       }
     }
+
     /* MIDI note messages */
     if (O->Midiin || O->FMidiin)
       while ((sensType = sensMidi(csound)) != 0)
-	if ((retval = process_rt_event(csound, sensType)) != 0)
-
+	if ((retval = process_rt_event(csound, sensType)) != 0) {
 	  goto scode;
+	}
   }
   /* no score event at this time, return to continue performance */
+
   return 0;
  scode:
-  /* get out here in realtime mode */ 
-  if(csound->oparms->realtime && retval == 2) return retval;
   /* end of section (retval == 1), score (retval == 2), */
   /* or lplay list (retval == 3) */
   if (getRemoteInsRfdCount(csound))
@@ -1185,7 +1193,8 @@ int sensevents(CSOUND *csound)
     RT_SPIN_UNLOCK
     goto retest;                            /*   & back for more */
   }
-  return 2;                   /* done with entire score */
+
+  return retval;                   /* done with entire score */
 }
 
 static inline uint64_t time2kcnt(CSOUND *csound, double tval)

diff --git a/Top/argdecode.c b/Top/argdecode.c
@@ -1079,7 +1079,7 @@ static int decode_long(CSOUND *csound, char *s, int argc, char **argv)
       return 1;  /* Try new parser */
     }
     else if (!(strcmp(s, "daemon"))) {
-      O->daemon = 1;
+      if(O->daemon == 0) O->daemon = 1;
       return 1;
     }
     else if (!(strncmp(s, "port=",5))) {