[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.77,1.78

[Mathias L. <lun...@us...>]

Update of /cvsroot/lmuse/muse/muse/arranger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2352/muse/arranger

Modified Files:
	arranger.cpp 
Log Message:
misc... 

Index: arranger.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** arranger.cpp	18 Apr 2005 19:01:30 -0000	1.77
--- arranger.cpp	18 Apr 2005 20:32:08 -0000	1.78
***************
*** 1312,1315 ****
--- 1312,1317 ----
        {
        int key = e->key();
+       bool keypress_handled = false;
+ 
        if (e->state() & ShiftButton)
              key += SHIFT;
***************
*** 1321,1324 ****
--- 1323,1327 ----
        if (shortcutsKbdMovement.isValid()) {
              if (key == shortcuts[SHRT_SEL_LEFT].key || key == shortcuts[SHRT_SEL_LEFT_ADD].key) {
+                   keypress_handled = true;
                    bool add = (key == shortcuts[SHRT_SEL_LEFT_ADD].key);
                    PartList* parts = shortcutsKbdMovement.track()->parts();
***************
*** 1343,1346 ****
--- 1346,1350 ----
                    }
              else if (key == shortcuts[SHRT_SEL_RIGHT].key || key == shortcuts[SHRT_SEL_RIGHT_ADD].key) {
+                   keypress_handled = true;
                    bool add = (key == shortcuts[SHRT_SEL_RIGHT_ADD].key);
                    PartList* parts = shortcutsKbdMovement.track()->parts();
***************
*** 1370,1394 ****
                    // TODO
                    }
!             // Delete parts
!             else if (key == shortcuts[SHRT_DELETE].key) {
!                   song->startUndo();
!                   PartList* midiParts = song->getSelectedMidiParts();
!                   for (iPart i = midiParts->begin(); i != midiParts->end(); i++) {
!                         Part* p = i->second;
!                         Track* t = p->track();
!                         audio->msgRemovePart(p, false);
!                         t->partListChanged();
!                         }
!                   PartList* audioParts = song->getSelectedWaveParts();
!                   for (iPart i = audioParts->begin(); i != audioParts->end(); i++) {
!                         Part* p = i->second;
!                         Track* t = p->track();
!                         audio->msgRemovePart(p, false);
!                         t->partListChanged();
!                         }
!                   song->endUndo(SC_PART_REMOVED);
                    }
              }
!       else {
              e->ignore();
              }
--- 1374,1403 ----
                    // TODO
                    }
!             } // -- end movement
!       //
!       // Delete parts
!       //
!       if (key == shortcuts[SHRT_DELETE].key) {
!             keypress_handled = true;
!             song->startUndo();
!             PartList* midiParts = song->getSelectedMidiParts();
!             for (iPart i = midiParts->begin(); i != midiParts->end(); i++) {
!                   Part* p = i->second;
!                   Track* t = p->track();
!                   audio->msgRemovePart(p, false);
!                   t->partListChanged();
                    }
+             PartList* audioParts = song->getSelectedWaveParts();
+             for (iPart i = audioParts->begin(); i != audioParts->end(); i++) {
+                   Part* p = i->second;
+                   Track* t = p->track();
+                   audio->msgRemovePart(p, false);
+                   t->partListChanged();
+                   }
+             song->endUndo(SC_PART_REMOVED);
              }
! 
!       // If we haven't dealt with the keypress, pass it along
!       if (!keypress_handled) {
              e->ignore();
              }