comparison examples/basic_libpd/render.cpp @ 349:6e454ebd9cc4 prerelease

Removed libpd_queued

 #include <Utilities.h>
 #include <I2c_Codec.h>
 #include <PRU.h>
 #include <stdio.h>
 #include "z_libpd.h"
-#include "z_queued.h"
 #include "s_stuff.h"
 #include <UdpServer.h>
 #include <Midi.h>
 //extern t_sample* sys_soundin;
 //extern t_sample* sys_soundout;

     }
 }
 
 #define PARSE_MIDI
 AuxiliaryTask libpdReadFilesTask;
-AuxiliaryTask libpdProcessMessageQueueTask;
-AuxiliaryTask libpdProcessMidiQueueTask;
 Midi midi;
 //UdpServer udpServer;
 
 void sendDigitalMessage(bool state, unsigned int delay, void* receiverName){
 	libpd_float((char*)receiverName, (float)state);

 	// it would still work, but the load would be executed unevenly between calls to render
 	if(context->audioFrames < gLibpdBlockSize){
 		fprintf(stderr, "Error: minimum block size must be %d\n", gLibpdBlockSize);
 		return false;
 	}
-	// init pd
-	libpd_set_queued_printhook(Bela_printHook); // set this before calling libpd_init
-	libpd_set_queued_noteonhook(pdnoteon);
+	// set hooks before calling libpd_init
+	libpd_set_printhook(Bela_printHook);
+	libpd_set_floathook(Bela_floatHook);
+	libpd_set_noteonhook(pdnoteon);
 	//TODO: add hooks for other midi events and generate MIDI output appropriately
-	libpd_queued_init();
+	libpd_init();
 	//TODO: ideally, we would analyse the ASCII of the patch file and find the in/outs to use
 	libpd_init_audio(gChannelsInUse, gChannelsInUse, context->audioSampleRate);
 
 	libpd_start_message(1); // one entry in list
 	libpd_add_float(1.0f);

 	gInBuf = libpd_get_sys_soundin();
 	gOutBuf = libpd_get_sys_soundout();
 	libpdReadFilesTask = Bela_createAuxiliaryTask(libpdReadFilesLoop, 60, "libpdReadFiles");
 	Bela_scheduleAuxiliaryTask(libpdReadFilesTask);
 
-	// Higher priority for the midi queue and lower priority for the message queue. Adjust to taste
-	libpdProcessMidiQueueTask = Bela_createAuxiliaryTask(libpd_queued_receive_midi_messages, 80, "libpdProcessMidiQueue");
-	libpdProcessMessageQueueTask = Bela_createAuxiliaryTask(libpd_queued_receive_pd_messages, 70, "libpdProcessMessageQueue");
+
 	return true;
 }
 
 // render() is called regularly at the highest priority by the audio engine.
 // Input and output are given from the audio hardware and the other

 	while((input = midi.getInput()) >= 0){
 		libpd_midibyte(0, input);
 	}
 #endif /* PARSE_MIDI */
 
-/*
- *	NOTE: if you are only using audio (or only analogs) and you are using interleaved buffers
- *	 and the blocksize of Bela is the same as gLibPdBlockSize, then you probably
- *	 do not need the for loops before and after libpd_process_float, so you can save quite some
- *	 memory operations.
- */
 	static unsigned int numberOfPdBlocksToProcess = gBufLength / gLibpdBlockSize;
 	for(unsigned int tick = 0; tick < numberOfPdBlocksToProcess; ++tick){
 		unsigned int audioFrameBase = gLibpdBlockSize * tick;
 		unsigned int j;
 		unsigned int k;

 					analogWriteOnce(context, analogFrame + 1, k, *p1);
 				}
 			}
 		}
 	}
-	Bela_scheduleAuxiliaryTask(libpdProcessMidiQueueTask);
-	Bela_scheduleAuxiliaryTask(libpdProcessMessageQueueTask);
 }
 
 // cleanup() is called once at the end, after the audio has stopped.
 // Release any resources that were allocated in setup().
 
 void cleanup(BelaContext *context, void *userData)
 {
-	libpd_queued_release();
 	delete[] dtm;
 }