--- linuxsampler/trunk/src/linuxsampler.cpp 2004/01/18 20:31:31 31 +++ linuxsampler/trunk/src/linuxsampler.cpp 2004/03/05 13:46:15 35 @@ -27,8 +27,6 @@ #include #include -#include - #include "global.h" #include "diskthread.h" #include "audiothread.h" @@ -38,6 +36,7 @@ #include "stream.h" #include "RIFF.h" #include "gig.h" +#include "network/lscpserver.h" #define AUDIO_CHANNELS 2 // stereo #define AUDIO_FRAGMENTS 3 // 3 fragments, if it does not work set it to 2 @@ -48,40 +47,33 @@ patch_format_unknown, patch_format_gig, patch_format_dls -} patch_format; +} patch_format = patch_format_unknown; -AudioIO* pAudioIO; -DiskThread* pDiskThread; -AudioThread* pAudioThread; -MidiIn* pMidiInThread; -RIFF::File* pRIFF; -gig::File* pGig; -gig::Instrument* pInstrument; -uint instrument_index; -double volume; -int num_fragments; -int fragmentsize; -std::string input_client; -pthread_t signalhandlerthread; +AudioIO* pAudioIO = NULL; +MidiIn* pMidiInThread = NULL; +LSCPServer* pLSCPServer = NULL; +AudioThread* pEngine = NULL; +uint instrument_index = 0; +double volume = 0.25; +int num_fragments = AUDIO_FRAGMENTS; +int fragmentsize = AUDIO_FRAGMENTSIZE; +uint samplerate = AUDIO_SAMPLERATE; +String input_client; +String alsaout = "0,0"; // default card +String jack_playback[2] = { "", "" }; +bool use_jack = true; +bool run_server = false; +pthread_t signalhandlerthread; void parse_options(int argc, char **argv); void signal_handler(int signal); int main(int argc, char **argv) { - pAudioIO = NULL; - pRIFF = NULL; - pGig = NULL; // setting signal handler for catching SIGINT (thus e.g. ) signalhandlerthread = pthread_self(); signal(SIGINT, signal_handler); - patch_format = patch_format_unknown; - instrument_index = 0; - num_fragments = AUDIO_FRAGMENTS; - fragmentsize = AUDIO_FRAGMENTSIZE; - volume = 0.25; // default volume - // parse and assign command line options parse_options(argc, argv); @@ -91,75 +83,56 @@ return EXIT_FAILURE; } + int error = 1; #if HAVE_JACK - dmsg(1,("Initializing audio output (Jack)...")); - pAudioIO = new JackIO(); - int error = ((JackIO*)pAudioIO)->Initialize(AUDIO_CHANNELS); + if (use_jack) { + dmsg(1,("Initializing audio output (Jack)...")); + pAudioIO = new JackIO(); + error = ((JackIO*)pAudioIO)->Initialize(AUDIO_CHANNELS, jack_playback); + if (error) dmsg(1,("Trying Alsa output instead.\n")); + } +#endif // HAVE_JACK if (error) { - dmsg(1,("Trying Alsa output instead.\n")); dmsg(1,("Initializing audio output (Alsa)...")); pAudioIO = new AlsaIO(); - int error = ((AlsaIO*)pAudioIO)->Initialize(AUDIO_CHANNELS, AUDIO_SAMPLERATE, num_fragments, fragmentsize); + int error = ((AlsaIO*)pAudioIO)->Initialize(AUDIO_CHANNELS, samplerate, num_fragments, fragmentsize, alsaout); if (error) return EXIT_FAILURE; } dmsg(1,("OK\n")); -#else // Alsa only - dmsg(1,("Initializing audio output (Alsa)...")); - pAudioIO = new AlsaIO(); - int error = ((AlsaIO*)pAudioIO)->Initialize(AUDIO_CHANNELS, AUDIO_SAMPLERATE, num_fragments, fragmentsize); - if (error) return EXIT_FAILURE; - dmsg(1,("OK\n")); -#endif // HAVE_JACK - // Loading gig file - try { - printf("Loading gig file..."); - fflush(stdout); - pRIFF = new RIFF::File(argv[argc - 1]); - pGig = new gig::File(pRIFF); - pInstrument = pGig->GetInstrument(instrument_index); - if (!pInstrument) { - printf("there's no instrument with index %d.\n", instrument_index); - exit(EXIT_FAILURE); - } - pGig->GetFirstSample(); // just to complete instrument loading before we enter the realtime part - printf("OK\n"); - fflush(stdout); - } - catch (RIFF::Exception e) { - e.PrintMessage(); - return EXIT_FAILURE; - } - catch (...) { - printf("Unknown exception while trying to parse gig file.\n"); - return EXIT_FAILURE; - } + AudioThread* pEngine = new AudioThread(pAudioIO); + MidiIn* pMidiInThread = new MidiIn(pEngine); - DiskThread* pDiskThread = new DiskThread(((pAudioIO->MaxSamplesPerCycle() << MAX_PITCH) << 1) + 6); //FIXME: assuming stereo - AudioThread* pAudioThread = new AudioThread(pAudioIO, pDiskThread, pInstrument); - MidiIn* pMidiInThread = new MidiIn(pAudioThread); + // Loading gig file + result_t result = pEngine->LoadInstrument(argv[argc - 1], instrument_index); + if (result.type == result_type_error) return EXIT_FAILURE; + pEngine->Volume = volume; - dmsg(1,("Starting disk thread...")); - pDiskThread->StartThread(); - dmsg(1,("OK\n")); dmsg(1,("Starting MIDI in thread...")); if (input_client.size() > 0) pMidiInThread->SubscribeToClient(input_client.c_str()); pMidiInThread->StartThread(); dmsg(1,("OK\n")); sleep(1); + dmsg(1,("Starting audio thread...")); - pAudioThread->Volume = volume; - pAudioIO->AssignEngine(pAudioThread); + pAudioIO->AssignEngine(pEngine); pAudioIO->Activate(); dmsg(1,("OK\n")); + if (run_server) { + dmsg(1,("Starting network server...")); + pLSCPServer = new LSCPServer(pEngine); + pLSCPServer->StartThread(); + dmsg(1,("OK\n")); + } + printf("LinuxSampler initialization completed.\n"); while(true) { printf("Voices: %3.3d (Max: %3.3d) Streams: %3.3d (Max: %3.3d, Unused: %3.3d)\r", - pAudioThread->ActiveVoiceCount, pAudioThread->ActiveVoiceCountMax, - pDiskThread->ActiveStreamCount, pDiskThread->ActiveStreamCountMax, Stream::GetUnusedStreams()); + pEngine->ActiveVoiceCount, pEngine->ActiveVoiceCountMax, + pEngine->pDiskThread->ActiveStreamCount, pEngine->pDiskThread->ActiveStreamCountMax, Stream::GetUnusedStreams()); fflush(stdout); usleep(500000); } @@ -172,14 +145,10 @@ // stop all threads if (pAudioIO) pAudioIO->Close(); if (pMidiInThread) pMidiInThread->StopThread(); - if (pDiskThread) pDiskThread->StopThread(); // free all resources if (pMidiInThread) delete pMidiInThread; - if (pAudioThread) delete pAudioThread; - if (pDiskThread) delete pDiskThread; - if (pGig) delete pGig; - if (pRIFF) delete pRIFF; + if (pEngine) delete pEngine; if (pAudioIO) delete pAudioIO; printf("LinuxSampler stopped due to SIGINT\n"); @@ -199,6 +168,10 @@ {"gig",0,0,0}, {"instrument",1,0,0}, {"inputclient",1,0,0}, + {"alsaout",1,0,0}, + {"jackout",1,0,0}, + {"samplerate",1,0,0}, + {"server",0,0,0}, {"help",0,0,0}, {0,0,0,0} }; @@ -208,28 +181,58 @@ if(res == -1) break; if (res == 0) { switch(option_index) { - case 0: + case 0: // --numfragments num_fragments = atoi(optarg); break; - case 1: + case 1: // --fragmentsize fragmentsize = atoi(optarg); break; - case 2: + case 2: // --volume volume = atof(optarg); break; - case 3: + case 3: // --dls patch_format = patch_format_dls; break; - case 4: + case 4: // --gig patch_format = patch_format_gig; break; - case 5: + case 5: // --instrument instrument_index = atoi(optarg); break; - case 6: + case 6: // --inputclient input_client = optarg; break; - case 7: + case 7: // --alsaout + alsaout = optarg; + use_jack = false; // If this option is specified do not connect to jack + break; + case 8: { // --jackout + try { + String arg(optarg); + // remove outer apostrophes + arg = arg.substr(arg.find('\'') + 1, arg.rfind('\'') - (arg.find('\'') + 1)); + // split in two arguments + jack_playback[0] = arg.substr(0, arg.find("\' ")); + jack_playback[1] = arg.substr(arg.find("\' ") + 2, arg.size() - (arg.find("\' ") + 2)); + // remove inner apostrophes + jack_playback[0] = jack_playback[0].substr(0, jack_playback[0].find('\'')); + jack_playback[1] = jack_playback[1].substr(jack_playback[1].find('\'') + 1, jack_playback[1].size() - jack_playback[1].find('\'')); + // this is the default but set it up anyway in case alsa_card was also used. + use_jack = true; + } + catch (...) { + fprintf(stderr, "Invalid argument '%s' for parameter --jackout\n", optarg); + exit(EXIT_FAILURE); + } + break; + } + case 9: // --samplerate + samplerate = atoi(optarg); + break; + case 10: // --server + run_server = true; + break; + case 11: // --help printf("usage: linuxsampler [OPTIONS] \n\n"); printf("--gig loads a Gigasampler instrument\n"); printf("--dls loads a DLS instrument\n"); @@ -242,7 +245,15 @@ printf(" default: 0.25)\n"); printf("--inputclient connects to an Alsa sequencer input client on startup\n"); printf(" (e.g. 64:0 to connect to a client with ID 64 and port 0)\n"); - exit(0); + printf("--alsaout connects to the given Alsa sound device on startup\n"); + printf(" (e.g. 0,0 to connect to hw:0,0 or plughw:0,0)\n"); + printf("--jackout connects to the given Jack playback ports on startup\n"); + printf(" (e.g. \"\'alsa_pcm:playback_1\' \'alsa_pcm:playback_2\'\"\n"); + printf(" in case of stereo output)\n"); + printf("--samplerate sets sample rate if supported by audio output system\n"); + printf(" (e.g. 44100)\n"); + printf("--server launch network server for remote control\n"); + exit(EXIT_SUCCESS); break; } }