Changeset 1295

Timestamp:

10/30/07 01:16:02 (10 months ago)

Author:

calvin

Message:

zoners patch with modifications: export wave, open in external editor and re-import.
also allow setting max_tracks on a machine instead of max_tracks-1

Location:

trunk/src/buzelib

Files:

• BuzeConfiguration.cpp (modified) (1 diff)
• BuzeConfiguration.h (modified) (1 diff)
• EditorActions.cpp (modified) (1 diff)
• MainFrm.cpp (modified) (3 diffs)
• MainFrm.h (modified) (3 diffs)
• WaveTableList.cpp (modified) (1 diff)
• resource.h (modified) (1 diff)

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -186 +186 @@
 }
 
+std::string CConfiguration::getExternalWaveEditor() {
+        string cmd;
+        if (!getConfigString("Settings", "ExternalWaveEditor", &cmd))
+                return "";
+        return cmd;
+}
+
+void CConfiguration::setExternalWaveEditor(std::string cmd) {
+        setConfigString("Settings", "ExternalWaveEditor", cmd);
+}
+
 void CConfiguration::setMachineParameterVisibility(std::string uri, int parameterIndex, bool state) {
         setConfigNumber("Machines\\" + (string)uri + "\\ExtMachineInfo\\Parameter" + stringFromInt(parameterIndex), "Hidden", state?1:0);

trunk/src/buzelib/BuzeConfiguration.h

@@ -51 +51 @@
         void setMachineSkinVisibility(std::string uri, bool state);
         bool getMachineSkinVisibility(std::string uri);
+
+        void setExternalWaveEditor(std::string cmd);
+        std::string getExternalWaveEditor();
+
 };

trunk/src/buzelib/EditorActions.cpp

@@ -747 +747 @@
         int numTracks=this->tracks;
         
-        if (numTracks<machine->loader->plugin_info->max_tracks) {
+        if (numTracks<=machine->loader->plugin_info->max_tracks) {
                 int prevTracks = machine->getTracks();
                 machine->setTracks(numTracks);

trunk/src/buzelib/MainFrm.cpp

@@ -35 +35 @@
 #include <sys/stat.h>
 #include <fstream>
+#include <win32/sndfile.h>
 #include "DockTabFrame/DockTabSerializer.h"
 
@@ -861 +862 @@
 }
 
+LRESULT CMainFrame::OnWaveXEdit(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+        assert(document->selectedWave);
+
+        int wavetableIndex = document->getWaveIndex(document->selectedWave);
+
+        // Get global settings
+
+        std::string waveEditor = _Module.configuration->getExternalWaveEditor();
+
+        if (!waveEditor.length()) {
+                MessageBox("No wave editor specified", "Error");
+                return 0;
+        }
+
+        char tmpPath[MAX_PATH];
+        GetTempPath(MAX_PATH, tmpPath);
+
+        std::string tempFile = tmpPath + stringFromInt(wavetableIndex) + ".wav";
+
+        PROCESS_INFORMATION pi;
+        STARTUPINFO si;
+
+        memset(&si,0,sizeof(si));
+        si.cb= sizeof(si);
+
+        // Export document->selectedWave as tmpFileName
+
+        if(!exportWaveEntry(document->selectedWave, const_cast<char*>(tempFile.c_str()))) {
+                MessageBox("Unable to create temporary file", tempFile.c_str());
+                return 0;
+        }
+
+        // Create a process for the wave editor, editing the temporary file
+
+        std::string command = "\"" + waveEditor + "\" " + tempFile;
+        char commandStr[1024];
+        strncpy(commandStr, command.c_str(), 1024);
+        if(!CreateProcess(NULL, commandStr, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) {
+                MessageBox("Unable to spawn the external wave editor.", command.c_str());
+        }
+
+        return 0;
+}
+
+LRESULT CMainFrame::OnWaveIEdit(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+        assert(document->selectedWave);
+
+        int wavetableIndex = document->getWaveIndex(document->selectedWave);
+
+        // Get global settings
+
+        char tmpPath[MAX_PATH];
+        GetTempPath(MAX_PATH, tmpPath);
+
+        std::string tempFile = tmpPath + stringFromInt(wavetableIndex) + ".wav";
+
+        // Re-Import tmpFileName into document->selectedWave
+
+        std::string originalFileName = document->selectedWave->fileName;
+        std::string originalName = document->selectedWave->name;
+        CBrowserIterator* browser;
+
+        browser = CArchiveBrowserBase::createBrowser(tempFile);
+        if (!browser) {
+                MessageBox("Unable to import the temporary wave file", tempFile.c_str());
+                return 0;
+        }
+
+        importWaveEntry(browser, document->selectedWave);
+        browser->close();
+        delete browser;
+
+        document->selectedWave->fileName = originalFileName;
+        document->selectedWave->name = originalName;
+
+        // This UI refresh is required as the names were reinstated
+        document->updateAllViews(0, UpdateImportWave, document->selectedWave);
+
+        if(remove(tempFile.c_str()))
+        {
+                MessageBox("Unable to delete the temporary wave file", tempFile.c_str());
+        }
+
+        
+        return 0;
+}
+
 LRESULT CMainFrame::OnWaveLevelProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
         showPropertyView();
@@ -2226 +2314 @@
 }
 
+bool CMainFrame::exportWaveEntry(zzub::wave_info_ex* entry, char *path) {
+        zzub_wave_t* wave = (zzub_wave_t*)entry;
+        int result = -1;
+        int level = 0;
+        SF_INFO sfinfo;
+
+        memset(&sfinfo, 0, sizeof(sfinfo));
+        sfinfo.samplerate = wave->get_samples_per_sec(level);
+        sfinfo.channels = wave->get_stereo()?2:1;
+        sfinfo.format = SF_FORMAT_WAV;
+        if (wave->get_bits_per_sample(level) == 16)
+                sfinfo.format |= SF_FORMAT_PCM_16;
+        else if (wave->get_bits_per_sample(level) == 8)
+                sfinfo.format |= SF_FORMAT_PCM_S8;
+        else if (wave->get_bits_per_sample(level) == 24)
+                sfinfo.format |= SF_FORMAT_PCM_24;
+        else if (wave->get_bits_per_sample(level) == 32)
+                sfinfo.format |= SF_FORMAT_PCM_32;
+        else
+                return 0;
+        SNDFILE *sf = sf_open(path, SFM_WRITE, &sfinfo);
+        if (!sf)
+                return 0;
+        zzub::wave_level* wavelevel = wave->get_level(level);
+        sf_writef_short(sf, (const short*)wave->get_sample_ptr(level), wave->get_sample_count(level));
+        sf_close(sf); // so close it
+        return 1;
+
+}
 
 bool CMainFrame::importWaveEntry(CBrowserIterator* it, wave_info_ex* entry) {

trunk/src/buzelib/MainFrm.h

@@ -320 +320 @@
                 COMMAND_ID_HANDLER(ID_MACHINE_PROPERTIES, OnMachineProperties)
                 COMMAND_ID_HANDLER(ID_WAVE_PROPERTIES, OnWaveProperties)
+                COMMAND_ID_HANDLER(ID_WAVE_XEDIT, OnWaveXEdit)
+                COMMAND_ID_HANDLER(ID_WAVE_IEDIT, OnWaveIEdit)
                 COMMAND_ID_HANDLER(ID_WAVELEVEL_PROPERTIES, OnWaveLevelProperties)
                 COMMAND_ID_HANDLER(ID_WAVELEVEL_ADD, OnWaveLevelAdd)
@@ -400 +402 @@
         LRESULT OnMachineProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnWaveProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnWaveXEdit(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnWaveIEdit(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnWaveLevelProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnWaveLevelAdd(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
@@ -560 +564 @@
         // wave table editing
         bool importWaveEntry(CBrowserIterator* , zzub::wave_info_ex* entry);
+        bool exportWaveEntry(zzub::wave_info_ex* entry, char *path);
 
         void mixdownSong(zzub::metaplugin* plugin, zzub::metaplugin* rec);

trunk/src/buzelib/WaveTableList.cpp

@@ -123 +123 @@
         view->mainFrame->document->selectWave(wave);
         menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_WAVE_PROPERTIES, "Properties");
+        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_WAVE_XEDIT, "Export And Open With External Editor");
+        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_WAVE_IEDIT, "Re-Import");
 
         ClientToScreen(&pt);

trunk/src/buzelib/resource.h

@@ -398 +398 @@
 #define ID_EDIT_STEP_8                 53432
 #define ID_EDIT_STEP_9                 53433
+#define ID_WAVE_XEDIT                                   53434
+#define ID_WAVE_IEDIT                                   53435
 
 // Next default values for new objects