[Lmuse-cvs-traffic] muse/muse extmidieditor.cpp,1.10,1.11 extmidieditor.h,1.10,1.11 midieditor.cpp,1.12,1.13 midieditor.h,1.10,1.11

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

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

Modified Files:
	extmidieditor.cpp extmidieditor.h midieditor.cpp midieditor.h 
Log Message:
cleanup

Index: extmidieditor.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/extmidieditor.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** extmidieditor.h	23 Oct 2004 23:57:06 -0000	1.10
--- extmidieditor.h	25 Oct 2004 20:44:10 -0000	1.11
***************
*** 57,61 ****
  
     public:
!       GraphMidiEditor(int raster, PartList*, QWidget* parent = 0, const char* name = 0);
        virtual ~GraphMidiEditor();
        //int rasterStep(unsigned tick) const   { return sigmap.rasterStep(tick, _raster); }
--- 57,61 ----
  
     public:
!       GraphMidiEditor(PartList*, QWidget* parent = 0, const char* name = 0);
        virtual ~GraphMidiEditor();
        //int rasterStep(unsigned tick) const   { return sigmap.rasterStep(tick, _raster); }
***************
*** 112,116 ****
  
     public:
!       ExtMidiEditor(int quantInit, int rasterInit, PartList*, QWidget* parent = 0, const char* name = 0);
        virtual ~ExtMidiEditor();
        int quantVal(int v) const;
--- 112,116 ----
  
     public:
!       ExtMidiEditor(PartList*, QWidget* parent = 0, const char* name = 0);
        virtual ~ExtMidiEditor();
        int quantVal(int v) const;

Index: midieditor.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midieditor.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** midieditor.h	25 Oct 2004 18:34:07 -0000	1.10
--- midieditor.h	25 Oct 2004 20:44:10 -0000	1.11
***************
*** 51,56 ****
  
     public:
!       MidiEditor(PartList*,
!          QWidget* parent = 0, const char* name = 0);
        virtual ~MidiEditor();
  
--- 51,55 ----
  
     public:
!       MidiEditor(PartList*, QWidget* parent = 0, const char* name = 0);
        virtual ~MidiEditor();
  

Index: midieditor.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midieditor.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** midieditor.cpp	25 Oct 2004 18:34:07 -0000	1.12
--- midieditor.cpp	25 Oct 2004 20:44:10 -0000	1.13
***************
*** 294,298 ****
  void MidiEditor::refreshSettings() const
        {
-       printf("MidiEditor::refreshSettings\n");
        settings->setX(pos().x());
        settings->setY(pos().y());
--- 294,297 ----

Index: extmidieditor.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/extmidieditor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** extmidieditor.cpp	25 Oct 2004 18:34:07 -0000	1.10
--- extmidieditor.cpp	25 Oct 2004 20:44:10 -0000	1.11
***************
*** 28,48 ****
  #include "tb1.h"
  
- //EditorSettings GraphMidiEditor::defaultSettings = EditorSettings(0);
- //ExtEditorSettings ExtMidiEditor::defaultSettings = ExtEditorSettings(0, 0);
- 
  //---------------------------------------------------------
  //   GraphMidiEditor
  //---------------------------------------------------------
  
! GraphMidiEditor::GraphMidiEditor(int rasterInit, PartList* pl, QWidget* parent, const char* name)
        :MidiEditor(pl, parent, name)
        {
        //TODO: Remove rasterInit
-       //_raster = defaultSettings.raster();
-       //_raster = 0;
        canvas   = 0;
        wview    = 0;
        _followSong = true;
-       //printf("GraphMidiEditor, defaultSettings: %x\n",&defaultSettings);
        }
  
--- 28,42 ----
  #include "tb1.h"
  
  //---------------------------------------------------------
  //   GraphMidiEditor
  //---------------------------------------------------------
  
! GraphMidiEditor::GraphMidiEditor(PartList* pl, QWidget* parent, const char* name)
        :MidiEditor(pl, parent, name)
        {
        //TODO: Remove rasterInit
        canvas   = 0;
        wview    = 0;
        _followSong = true;
        }
  
***************
*** 129,133 ****
  void GraphMidiEditor::refreshSettings() const
        {
-       printf("GraphMidiEditor::refreshSettings\n");
        MidiEditor::refreshSettings();
        ((GraphEditorSettings*)settings)->setXmag(hscroll->xmag());
--- 123,126 ----
***************
*** 192,204 ****
  //---------------------------------------------------------
  
! ExtMidiEditor::ExtMidiEditor(int quantInit, int rasterInit, PartList* pl, QWidget* parent, const char* name)
!       :GraphMidiEditor(rasterInit, pl, parent, name)
        {
-       //TODO: Remove quantInit + rasterInit parameters
-       //_quant = defaultSettings.quant();
-       //_raster = defaultSettings.raster();
        _curDrumInstrument = -1;
        //printf("ExtMidiEditor, defaultSettings: %x\n",&defaultSettings);
-       //settings = (ExtEditorSettings*) getSettings();
        }
  
--- 185,193 ----
  //---------------------------------------------------------
  
! ExtMidiEditor::ExtMidiEditor(PartList* pl, QWidget* parent, const char* name)
!       :GraphMidiEditor(pl, parent, name)
        {
        _curDrumInstrument = -1;
        //printf("ExtMidiEditor, defaultSettings: %x\n",&defaultSettings);
        }
  
***************
*** 436,440 ****
        s->setMidiin(canvas->midiin());
        updateCtrlEdits();
-       printf("ExtMidiEditor::refreshSettings\n");
        }
  
--- 425,428 ----