!!! Song type is now removed !!! : See ChangeLog

4 files changed, 7 insertions, 49 deletions

diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 8d2328c3..942a5013 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -268,18 +268,6 @@ Arranger::Arranger(ArrangerView* parent, const char* name)
       toolbar->addWidget(lenEntry);
       connect(lenEntry, SIGNAL(valueChanged(int)), SLOT(songlenChanged(int)));
 
-      typeBox = new LabelCombo(tr("Type"), 0);
-      typeBox->insertItem(0, tr("NO"));
-      typeBox->insertItem(1, tr("GM"));
-      typeBox->insertItem(2, tr("GS"));
-      typeBox->insertItem(3, tr("XG"));
-      typeBox->setCurrentIndex(0);
-      typeBox->setToolTip(tr("midi song type"));
-      typeBox->setWhatsThis(tr("midi song type"));
-      typeBox->setFocusPolicy(Qt::TabFocus);
-      toolbar->addWidget(typeBox);
-      connect(typeBox, SIGNAL(activated(int)), SLOT(modeChange(int)));
-
       label = new QLabel(tr("Pitch"));
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
@@ -668,9 +656,6 @@ void Arranger::songChanged(MusECore::SongChangedFlags_t type)
           lenEntry->blockSignals(false);
         }
         
-        if(type & SC_SONG_TYPE)    
-          setMode(MusEGlobal::song->mtype());
-          
         if(type & (SC_SELECTION | SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED))
           trackSelectionChanged();
         
@@ -739,29 +724,6 @@ void Arranger::trackSelectionChanged()
       }
 
 //---------------------------------------------------------
-//   modeChange
-//---------------------------------------------------------
-
-void Arranger::modeChange(int mode)
-      {
-      MusEGlobal::song->setMType(MType(mode));
-      updateTrackInfo(-1);
-      focusCanvas();
-      }
-
-//---------------------------------------------------------
-//   setMode
-//---------------------------------------------------------
-
-void Arranger::setMode(int mode)
-      {
-      typeBox->blockSignals(true);
-      // This will only set if different.
-      typeBox->setCurrentIndex(mode);
-      typeBox->blockSignals(false);
-      }
-
-//---------------------------------------------------------
 //   writeStatus
 //---------------------------------------------------------
 
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index dd2c5290..e7d48d70 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -135,7 +135,6 @@ class Arranger : public QWidget {
 
       MusECore::Track* selected;
 
-      LabelCombo* typeBox;
       QToolButton* ib;
       int trackInfoType;
       Splitter* split;
@@ -159,7 +158,6 @@ class Arranger : public QWidget {
       void trackSelectionChanged();
       void trackInfoScroll(int);
       void songChanged(MusECore::SongChangedFlags_t);
-      void modeChange(int);
       void setTime(unsigned);
       void globalPitchChanged(int);
       void globalTempoChanged(int);
@@ -216,7 +214,6 @@ class Arranger : public QWidget {
       Arranger(ArrangerView* parent, const char* name = 0);
 
       PartCanvas* getCanvas() { return canvas; }
-      void setMode(int);
       void reset();
       
       void writeStatus(int level, MusECore::Xml&);
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 66e3bbbb..a2024159 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -388,8 +388,7 @@ void ArrangerView::songChanged(MusECore::SongChangedFlags_t type)
              //SC_SIG | SC_TEMPO | SC_MASTER |
              //SC_MIDI_TRACK_PROP |
              SC_CONFIG | 
-             SC_DRUMMAP| 
-             SC_SONG_TYPE)) 
+             SC_DRUMMAP)) 
     visTracks->updateVisibleTracksButtons();
 }
       
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index d16a8d29..dc65b0c1 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -492,7 +492,7 @@ void TList::paint(const QRect& r)
                                     MusECore::MidiInstrument* instr = mp->instrument();
                                     QString name;
                                     if (val!=MusECore::CTRL_VAL_UNKNOWN)
-                                      name = instr->getPatchName(mt->outChannel(), val, MusEGlobal::song->mtype(), mt->isDrumTrack());
+                                      name = instr->getPatchName(mt->outChannel(), val, mt->isDrumTrack());
                                     else
                                       name = tr("<unknown>");
                                       
@@ -2123,8 +2123,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
                       else
                       {
                         MusECore::MidiInstrument* instr = mp->instrument();
-                        if (delta>0) val=instr->getNextPatch(mt->outChannel(), val, MusEGlobal::song->mtype(), false);
-                        else if (delta<0) val=instr->getPrevPatch(mt->outChannel(), val, MusEGlobal::song->mtype(), false);
+                        if (delta>0) val=instr->getNextPatch(mt->outChannel(), val, false);
+                        else if (delta<0) val=instr->getPrevPatch(mt->outChannel(), val, false);   
                       }
 
                       if (val != oldval)
@@ -2169,7 +2169,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
                         MusECore::MidiInstrument* instr = mp->instrument();
                         
                         PopupMenu* pup = new PopupMenu(true);
-                        instr->populatePatchPopup(pup, mt->outChannel(), MusEGlobal::song->mtype(), mt->isDrumTrack());
+                        instr->populatePatchPopup(pup, mt->outChannel(), mt->isDrumTrack());
                         
                         if(pup->actions().count() == 0)
                         {
@@ -2623,8 +2623,8 @@ void TList::wheelEvent(QWheelEvent* ev)
                       else
                       {
                         MusECore::MidiInstrument* instr = mp->instrument();
-                        if (delta>0) val=instr->getNextPatch(mt->outChannel(), val, MusEGlobal::song->mtype(), false);
-                        else if (delta<0) val=instr->getPrevPatch(mt->outChannel(), val, MusEGlobal::song->mtype(), false);
+                        if (delta>0) val=instr->getNextPatch(mt->outChannel(), val, false); 
+                        else if (delta<0) val=instr->getPrevPatch(mt->outChannel(), val, false);
                       }
 
                       if (val != oldval)