Changeset 1320

Timestamp:

12/23/07 22:07:23 (8 months ago)

Author:

calvin

Message:

add azerty-support for belgium punt and comma keyboard layouts, fixes in keyjazz playing and recording, call updateAllViews on preference-apply

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• FileBrowserView.cpp (modified) (1 diff)
• MachineView.cpp (modified) (1 diff)
• PatternEditor/PatternEditorNoteKeys.h (modified) (2 diffs)
• Preferences/UiPreferencesView.cpp (modified) (1 diff)
• SequenceEditor.cpp (modified) (2 diffs)
• Utils/Keymaps.cpp (modified) (1 diff)
• WaveTableView.cpp (modified) (1 diff)
• res/keyboard_patterneditor.txt (modified) (2 diffs)

trunk/src/buzelib/Document.cpp

@@ -1296 +1296 @@
 }
 
-// from player.cpp:
-namespace zzub {
-        extern bool isNotePlaying(zzub::metaplugin* plugin, const std::vector<zzub::keyjazz_note>& keyjazz, int note);
-};
-
 void CDocument::playStream(int note, std::string pluginUri, std::string dataUrl) {
         if (!streamplayer) return ;
-        if (isNotePlaying(streamplayer, player->keyjazz, note)) {
-                return ;
-        }
 
         zzub::mem_archive archive;

trunk/src/buzelib/FileBrowserView.cpp

@@ -198 +198 @@
         }
 
+        if ((lParam & (1 << 30)) != 0) return 0;
+
         int note = midi_to_buzz_note(keyboard_mapper::map_code_to_note(mainFrame->document->octave, wParam));
         if (note == -1) return 0;

trunk/src/buzelib/MachineView.cpp

@@ -195 +195 @@
 
 LRESULT CMachineView::OnKeyDown(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
-        int note = midi_to_buzz_note(keyboard_mapper::map_code_to_note(document->octave, wParam));
+        if ((lParam & (1 << 30)) != 0) return 0;
+
+        int note = keyboard_mapper::map_code_to_note(document->octave, wParam);
+        if (note > 0 && note != zzub_note_value_off) note = midi_to_buzz_note(note);
         if (note == -1) return 0;
 

trunk/src/buzelib/PatternEditor/PatternEditorNoteKeys.h

@@ -37 +37 @@
                 return qwertz_cz;
             case 7:             // germany
-            case 14:            // hungary
-                return qwertz;
             case 12:            // french
                 switch (sublang) {
@@ -46 +44 @@
                         return azerty;
                 }
+            case 14:            // hungary
+                return qwertz;
+                        case 19:
+                                switch (sublang) {
+                                        case 2:         // belgium punt
+                                                return azerty;
+                                        default:
+                                                return qwerty;
+                                }
+                        case 30:
+                                switch (sublang) {
+                                        case 60:        // belgium comma
+                                                return azerty;
+                                        default:
+                                                return qwerty;
+                                }               
             default:            // any other
                 return qwerty;

trunk/src/buzelib/Preferences/UiPreferencesView.cpp

@@ -33 +33 @@
         _Module.configuration->setPatternMode(patternMode);
         _Module.configuration->setStickySelections(stickySelections);
+
+        if (mainFrame->document) mainFrame->document->updateAllViews(0, UpdateSettings, 0);
 }

trunk/src/buzelib/SequenceEditor.cpp

@@ -854 +854 @@
 
 void CSequenceEditor::invalidateSongPosition() {
+
         paintMode=SequenceViewPosition;
         RECT rc;
         getPositionRect(&rc);
 
-        rc.top=prevPositionRect.top-2;
-        rc.bottom+=2;
+        if(prevPositionRect.top < rc.top)
+                rc.top = prevPositionRect.top - 2;
+        else
+                rc.top -= 2;
+
+        if(prevPositionRect.bottom > rc.bottom)
+                rc.bottom = prevPositionRect.bottom + 2;
+        else
+                rc.bottom += 2;
 
         HideCaret();
@@ -867 +875 @@
         paintMode=SequenceViewAll;
         ShowCaret();
+
+        /*
+        paintMode=SequenceViewPosition;
+        RECT rc;
+        getPositionRect(&rc);
+
+        rc.top=prevPositionRect.top-2;
+        rc.bottom+=2;
+
+        HideCaret();
+        InvalidateRect(&rc, FALSE);
+
+        UpdateWindow();
+        paintMode=SequenceViewAll;
+        ShowCaret();*/
 }
 

trunk/src/buzelib/Utils/Keymaps.cpp

@@ -41 +41 @@
         { 0x0c,   -1, keyboard_mapper::fr_azerty_keycodes },    // france - rest
         { 0x0e,   -1, keyboard_mapper::de_qwertz_keycodes },    // hungary
+        { 0x13, 0x02, keyboard_mapper::fr_azerty_keycodes },    // belgium (punt)
         { 0x14,   -1, keyboard_mapper::no_qwerty_keycodes },    // norway
+        { 0x1e, 0x3c, keyboard_mapper::fr_azerty_keycodes },    // belgium (comma)
 
 // everybody else gets qwerty

trunk/src/buzelib/WaveTableView.cpp

@@ -441 +441 @@
 
 LRESULT CWaveTableView::OnKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+        // lParam bit 30 : Specifies the previous key state. The value is 1 if the key is down before the message is sent, or it is zero if the key is up.
+
+        if ((lParam & (1 << 30)) != 0) return 0;
+
         int note = midi_to_buzz_note(keyboard_mapper::map_code_to_note(document->octave, wParam));
         if (note == -1) return 0;

trunk/src/buzelib/res/keyboard_patterneditor.txt

@@ -61 +61 @@
         Ctrl+R                          Randomize selection 
         Ctrl+T                          Toggle column editor for number columns
-        Ctrl+U                          Unselect
         Ctrl+Up                         Show pattern for next machine 
         Ctrl+Down                       Show pattern for previous machine 
@@ -68 +67 @@
         Shift+Ctrl+D                    Select 16/32/64/.. rows from cursor 
         Shift+Ctrl+L                    Select track/group/all
+        Shift+Ctrl+U                    Unselect
         Space                           Paste current parameter value
         Ctrl+Space                      Paste current group values