Changeset 1283

Timestamp:

10/14/07 13:17:45 (12 months ago)

Author:

calvin

Message:

24 bit stereo bugfix, general fixes for !16 bit samples, didnt open midi out devices on init, mixdown bypasses audiodriver, +++

Location:

trunk/src

Files:

• audioimportlib/Riff.cpp (modified) (1 diff)
• buzeVSTi/buzeVSTi.cpp (modified) (1 diff)
• buzeVSTi/buzeVSTi.h (modified) (1 diff)
• buzelib/Document.cpp (modified) (4 diffs)
• buzelib/MainFrm.cpp (modified) (5 diffs)
• buzelib/WaveTableView.cpp (modified) (2 diffs)
• buzelib/buze.cpp (modified) (1 diff)

trunk/src/audioimportlib/Riff.cpp

@@ -600 +600 @@
                                         Sample[0] = INT32 ( x );
                                         assert(align-3 <= sizeof(DWORD));
-                                        Read(&aligntemp, align-3); // skip extra alignment byte if it exists
 
                                         retcode = Read (&x, 3 );
                                         Sample[1] = INT32 ( x );
                                         assert(align-3 <= sizeof(DWORD));
-                                        Read(&aligntemp, align-3); // skip extra alignment byte if it exists
+                                        Read(&aligntemp, align-6); // skip extra alignment bytes if they exists (?)
                                         break;
                                 }

trunk/src/buzeVSTi/buzeVSTi.cpp

@@ -246 +246 @@
 }
 
+
+void BuzeVSTi::schedule_send(size_t index, int time_ms, unsigned int data) {
+}
+
 bool BuzeVSTi::send(size_t index, unsigned int data) {
         return true;
+}
+
+size_t BuzeVSTi::getDevices() {
+        return 1;
+}
+
+bool BuzeVSTi::isInput(size_t index) {
+        return true;
+}
+
+bool BuzeVSTi::isOutput(size_t index) {
+        return true;
+}
+
+bool BuzeVSTi::isOpen(size_t index) {
+        return true;
+}
+
+const char* BuzeVSTi::getDeviceName(size_t index) {
+        return "VST Host MIDI Device";
 }
 

trunk/src/buzeVSTi/buzeVSTi.h

@@ -45 +45 @@
         
         // zzub::midi_io
-    virtual bool poll();
-    virtual bool send(size_t index, unsigned int data);
+        virtual bool poll();
+        virtual bool send(size_t index, unsigned int data);
+        void schedule_send(size_t index, int time_ms, unsigned int data);
+        virtual size_t getDevices();
+        virtual bool isInput(size_t index);
+        virtual bool isOutput(size_t index);
+        virtual const char* getDeviceName(size_t index);
+        virtual bool isOpen(size_t index);
 
         // vst:

trunk/src/buzelib/Document.cpp

@@ -73 +73 @@
 void CDocument::selectMachine(metaplugin* machine) {
         resetKeyjazz();
+        player->midiNoteMachine = machine;
 
         if (!machine) return ;
@@ -83 +84 @@
 
 void CDocument::unselectMachine(metaplugin* machine) {
+        if (machine == player->midiNoteMachine)
+                player->midiNoteMachine = 0;
         vector<metaplugin*>::iterator i=find(selectedMachines.begin(), selectedMachines.end(), machine);
         if (i!=selectedMachines.end()) {
@@ -107 +110 @@
 
 void CDocument::clearSelectedMachines() {
+        player->midiNoteMachine = 0;
         selectedMachines.clear();
         updateAllViews(0, UpdateMachineSelection);
@@ -989 +993 @@
 
 int CDocument::getWaveLevelSamples(wave_level* entry) {
-        return entry->sample_count;
+        return entry->wave->get_sample_count(entry->level);
 }
 

trunk/src/buzelib/MainFrm.cpp

@@ -727 +727 @@
 }
 
+struct silent_device : zzub::audiodevice {
+        silent_device(int sampleRate) {
+                this->api_id = 0;
+                this->device_id = 0;
+                this->in_channels = 0;
+                this->name = "Silent";
+                this->out_channels = 2;
+                this->rates.push_back(sampleRate);
+        }
+};
+
 void CMainFrame::mixdownSong(metaplugin* plugin, metaplugin* recorder) {
         int oldWorkChannel = player->workChannel;
         bool playerLoop = player->getLoopEnabled();
 
-        int sampleRate = player->masterInfo.samples_per_second;
         _Module.releaseAudioDriver();
-        if (!_Module.setAudioDriver("Silent", "", sampleRate, 256, 0, false)) {
-                MessageBox("Could not set silent audio driver, mixdown aborted.", programName, MB_OK|MB_ICONERROR);
-                _Module.setAudioDriver();
-                return ;
-        }
+
+        silent_device tempdev(player->masterInfo.samples_per_second);
+        player->workDevice = &tempdev;
 
         _Module.showWaitWindow();
 
         document->connectMachines(plugin->getName(), recorder->getName());
-        //recorder->addInput(plugin, 0x4000, 0x4000);
 
         player->setSequencerPosition(player->getSongBeginLoop());
@@ -754 +761 @@
         _Module.setWaitWindowText("Recording...");
         while (player->getPlayState()==player_state_playing) {
-                Sleep(50);
+                player->workStereo(256);
         }
 
@@ -764 +771 @@
         player->setSongEnd(playerSongEnd);
         player->setLoopEnabled(playerLoop);
+        player->workDevice = 0;
         _Module.setAudioDriver();
         player->workChannel = oldWorkChannel;
@@ -2324 +2332 @@
 
 bool CMainFrame::invoke(zzub_event_data_t& data) {
-        if (data.type == event_type_midi_control) {
+/*      if (data.type == event_type_midi_control) {
 
                 char status = data.midi_message.status >> 4;
@@ -2350 +2358 @@
 
                 return true;
-        }
+        }*/
 
         if (data.type == event_type_wave_allocated) {

trunk/src/buzelib/WaveTableView.cpp

@@ -452 +452 @@
                 const wave_level& level=*entry->get_level(i);
                 string note=noteFromInt(level.root_note);
-                string len=stringFromInt(level.sample_count, 0);
+                string len=stringFromInt(entry->get_sample_count(i), 0);
                 string rate=stringFromInt(level.samples_per_second, 0);
-                string lbeg=stringFromInt(level.loop_start, 0);
-                string lend=stringFromInt(level.loop_end, 0);
+                string lbeg=stringFromInt(entry->get_loop_start(i), 0);
+                string lend=stringFromInt(entry->get_loop_end(i), 0);
                 string bits=stringFromInt(entry->get_bits_per_sample(i), 0);
 
@@ -717 +717 @@
                         break;
                 case UpdateMachines:
+                case UpdateSelectedMachine:
                         envelopeTab.updateMachines();
                         //recordTab.bindWavePlugins();

trunk/src/buzelib/buze.cpp

@@ -113 +113 @@
 
         vector<int> midiOutDevices;
-        configuration->getMidiOutputs(midiInDevices);
+        configuration->getMidiOutputs(midiOutDevices);
         for (size_t i = 0; i < midiOutDevices.size(); i++) {
                 int dev = midiOutDevices[i];