Changeset 1342

Timestamp:

01/09/08 22:23:22 (8 months ago)

Author:

calvin

Message:

added a toolbar button for the midi sync stuff, also added a lock in CDocument::playMachineNote

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• MainFrm.cpp (modified) (2 diffs)
• MainFrm.h (modified) (3 diffs)
• buze.rc (modified) (3 diffs)
• res/playback.bmp (modified) (previous)
• resource.h (modified) (1 diff)

trunk/src/buzelib/Document.cpp

@@ -1355 +1355 @@
 
 void CDocument::playMachineNote(metaplugin* m, int note, int prevNote) {
+        player->lock();
         player->playMachineNote(m, note, prevNote, 0);
+        player->unlock();
 }
 

trunk/src/buzelib/MainFrm.cpp

@@ -386 +386 @@
         UISetCheck(ID_RECORD, player->recordParameters?1:0);
         UISetCheck(ID_DEVICE_RESET, player->workDevice?0:1);
+        UISetCheck(ID_PLAY_SYNC, player->midiSyncTransport?1:0);
 
         UIEnable(ID_EDIT_TOGGLE_AUTOSAVE, FALSE);
@@ -1359 +1360 @@
 }
 
+LRESULT CMainFrame::OnPlaySync(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+        player->midiSyncTransport = !player->midiSyncTransport;
+        return 1;
+}
 
 LRESULT CMainFrame::OnRecord(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {

trunk/src/buzelib/MainFrm.h

@@ -231 +231 @@
                 UPDATE_ELEMENT(ID_PLAY, UPDUI_TOOLBAR)
                 UPDATE_ELEMENT(ID_PLAY_REPEAT, UPDUI_TOOLBAR)
+                UPDATE_ELEMENT(ID_PLAY_SYNC, UPDUI_TOOLBAR)
                 UPDATE_ELEMENT(ID_EDIT_TOGGLE_AUTOSAVE, UPDUI_TOOLBAR)
                 UPDATE_ELEMENT(ID_EDIT_RENDER_SEQUENCE, UPDUI_TOOLBAR)
@@ -313 +314 @@
                 COMMAND_ID_HANDLER(ID_RECORD, OnRecord)
                 COMMAND_ID_HANDLER(ID_PLAY_REPEAT, OnPlayRepeat)
+                COMMAND_ID_HANDLER(ID_PLAY_SYNC, OnPlaySync)
                 COMMAND_ID_HANDLER(ID_MACHINE_PATTERNS, OnMachinePatterns)
                 COMMAND_ID_HANDLER(ID_MACHINE_SEQUENCER, OnMachineSequencer)
@@ -434 +436 @@
         LRESULT OnRecord(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnPlayRepeat(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnPlaySync(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnFileExit(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnFileNew(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);

trunk/src/buzelib/buze.rc

@@ -126 +126 @@
     SEPARATOR
     BUTTON      ID_DEVICE_RESET
+    BUTTON      ID_PLAY_SYNC
 END
 
@@ -1105 +1106 @@
     ID_PATTERN_STOP         "Stop (F8)"
     ID_PATTERN_PLAY         "Play (Shift-F5)"
-    ID_PLAY_FROM_START      "Play From start\nPlay From Start"
+    ID_PLAY_FROM_START      "Play from start\nPlay From Start"
     ID_PLAY_REPEAT          "Toggle repeating on/off\nRepeat"
+    ID_PLAY_SYNC            "Sync To External MIDI Device\nSync To External MIDI Device"
     ID_FILEBROWSER_ADD_PATH "Add Path"
     ID_FILEBROWSER_REMOVE_PATH "Remove Path"
@@ -1127 +1129 @@
 STRINGTABLE 
 BEGIN
-    ID_BUTTON32816          "Import wave from file browser"
-    ID_BUTTON32817          "Save current wave to disk"
-    ID_BUTTON32818          "Clear current wave"
+    IDC_LOADWAVEBUTTON      "Import wave from file browser"
+    IDC_SAVEWAVEBUTTON      "Save current wave to disk"
+    IDC_CLEARWAVEBUTTON     "Clear current wave"
     ID_RECORD               "Record Parameter Movements\nRecord (F7)"
 END

trunk/src/buzelib/resource.h

@@ -182 +182 @@
 #define ID_MACHINE_ADDTRACK             32810
 #define ID_PLAYFROMCURSOR               32811
-#define ID_VIEW_ANALYZER                32813
-#define ID_WAVE_FADEOUT                 32814
-#define ID_WAVE_AMP                     32815
-#define ID_BUTTON32816                  32816
-#define ID_BUTTON32817                  32817
-#define ID_BUTTON32818                  32818
-#define ID_RECORD                       32820
-#define ID_CLOSEPANE                    32822
-#define ID_EDIT_DELETE                  32826
-#define ID_EDIT_SELECTALL               32827
-#define ID_EDIT_CLEARSELECTION          32828
-#define ID_VIEW_HARDDISKRECORDER        32829
-#define ID_VIEW_CPUMETER                32830
-#define ID_VIEW_FILES                   32831
-#define ID_DEVICE_RESET                 32833
-#define ID_VIEW_PROPERTIES              32835
-#define ID_PATTERN_CLONE                32837
-#define ID_PATTERN_DELETE               32838
-#define ID_PATTERN_STOP                 32839
-#define ID_PATTERN_PLAY                 32840
-#define ID_PLAY_FROM_START              32841
-#define ID_PLAY_REPEAT                  32842
+#define ID_VIEW_ANALYZER                32812
+#define ID_WAVE_FADEOUT                 32813
+#define ID_WAVE_AMP                     32814
+#define ID_RECORD                       32815
+#define ID_CLOSEPANE                    32816
+#define ID_EDIT_DELETE                  32817
+#define ID_EDIT_SELECTALL               32818
+#define ID_EDIT_CLEARSELECTION          32819
+#define ID_VIEW_HARDDISKRECORDER        32820
+#define ID_VIEW_CPUMETER                32821
+#define ID_VIEW_FILES                   32822
+#define ID_DEVICE_RESET                 32823
+#define ID_VIEW_PROPERTIES              32824
+#define ID_PATTERN_CLONE                32825
+#define ID_PATTERN_DELETE               32826
+#define ID_PATTERN_STOP                 32827
+#define ID_PATTERN_PLAY                 32828
+#define ID_PLAY_FROM_START              32829
+#define ID_PLAY_REPEAT                  32830
+#define ID_PLAY_SYNC                    32831
 #define ID_FILEBROWSER_ADD_PATH         32843
 #define ID_FILEBROWSER_REMOVE_PATH      32844