[Rosegarden-bugs] SF.net SVN: rosegarden:[12838] trunk/rosegarden/src/gui

[<ted...@us...>]

Revision: 12838
          http://rosegarden.svn.sourceforge.net/rosegarden/?rev=12838&view=rev
Author:   tedfelix
Date:     2012-02-24 00:17:15 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
No functional changes.  Removed unused code.  Made a few functions private.

Modified Paths:
--------------
    trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.cpp
    trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.h
    trunk/rosegarden/src/gui/application/RosegardenMainWindow.h
    trunk/rosegarden/src/gui/editors/segment/TrackButtons.cpp
    trunk/rosegarden/src/gui/editors/segment/TrackButtons.h

Modified: trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.cpp
===================================================================
--- trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.cpp	2012-02-23 00:35:27 UTC (rev 12837)
+++ trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.cpp	2012-02-24 00:17:15 UTC (rev 12838)
@@ -1897,43 +1897,7 @@
     slotAddAudioSegment(audioFileId, trackId, position, startTime, endTime);
 }
 
-#if 0
 void
-RosegardenMainViewWidget::slotMute(TrackId trackId, bool muted)
-{
-    //RG_DEBUG << "RosegardenMainViewWidget::slotMute() - track id =" << trackId << ", muted =" << muted;
-
-    Track *track = getDocument()->getComposition().getTrackById(trackId);
-
-    // Update the document
-    track->setMuted(muted);
-
-    // Notify observers
-    getDocument()->getComposition().notifyTrackChanged(track);
-    getDocument()->slotDocumentModified();
-}
-#endif
-
-#if 0
-void
-RosegardenMainViewWidget::slotMuteInstrument(InstrumentId id, bool muted)
-{
-    //RG_DEBUG << "RosegardenMainViewWidget::slotMuteInstrument - id =" << id << ", muted =" << muted;
-
-    Composition &comp = getDocument()->getComposition();
-    Composition::trackcontainer &tracks = comp.getTracks();
-
-    // For each track in the composition
-    for (Composition::trackiterator it = tracks.begin();
-            it != tracks.end(); ++it) {
-        // If this is the instrument we want, update the mute button.
-        if (it->second->getInstrument() == id)
-            slotMute(it->second->getId(), muted);
-    }
-}
-#endif
-
-void
 RosegardenMainViewWidget::slotSetRecord(InstrumentId id, bool value)
 {
     RG_DEBUG << "RosegardenMainViewWidget::slotSetRecord - "

Modified: trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.h
===================================================================
--- trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.h	2012-02-23 00:35:27 UTC (rev 12837)
+++ trunk/rosegarden/src/gui/application/RosegardenMainViewWidget.h	2012-02-24 00:17:15 UTC (rev 12838)
@@ -220,15 +220,6 @@
      */
     void slotChangeTrackLabel(TrackId id, QString label);
 
-    /// Set the mute state for a track.
-//    void slotMute(TrackId trackId, bool muted);
-
-    /// Set the mute state for an instrument.
-    /**
-     * @see slotMute()
-     */
-//    void slotMuteInstrument(InstrumentId, bool muted);
-
     /// Set the record state for an instrument.
     void slotSetRecord(InstrumentId, bool);
 

Modified: trunk/rosegarden/src/gui/application/RosegardenMainWindow.h
===================================================================
--- trunk/rosegarden/src/gui/application/RosegardenMainWindow.h	2012-02-23 00:35:27 UTC (rev 12837)
+++ trunk/rosegarden/src/gui/application/RosegardenMainWindow.h	2012-02-24 00:17:15 UTC (rev 12838)
@@ -255,7 +255,6 @@
     
     virtual void trackUp()            { slotTrackUp(); }
     virtual void trackDown()          { slotTrackDown(); }
-//    virtual void toggleMutedCurrentTrack() { slotToggleMute(); }
     virtual void toggleRecordCurrentTrack() { slotToggleRecordCurrentTrack(); }
        
     /**
@@ -1288,12 +1287,6 @@
     void slotTrackDown();
 
     /**
-     * Mute/Unmute
-     */
-    void slotMuteAllTracks();
-    void slotUnmuteAllTracks();
-
-    /**
      * Toggle arm (record) current track
      */
     void slotToggleRecordCurrentTrack();
@@ -1604,9 +1597,6 @@
                             QString informativeText);
 
 protected slots:
-    /// Toggles mute state of the currently selected track.
-    void slotToggleMute();
-
     void setupRecentFilesMenu();
 
 private:
@@ -1780,6 +1770,12 @@
      * Update the CPU level meter
      */
     void slotUpdateCPUMeter();
+
+    /// Toggles mute state of the currently selected track.
+    void slotToggleMute();
+    void slotMuteAllTracks();
+    void slotUnmuteAllTracks();
+
 };
 
 

Modified: trunk/rosegarden/src/gui/editors/segment/TrackButtons.cpp
===================================================================
--- trunk/rosegarden/src/gui/editors/segment/TrackButtons.cpp	2012-02-23 00:35:27 UTC (rev 12837)
+++ trunk/rosegarden/src/gui/editors/segment/TrackButtons.cpp	2012-02-24 00:17:15 UTC (rev 12838)
@@ -135,16 +135,6 @@
     // Probably don't need to disconnect as we only go away when the
     // doc and composition do.  shared_ptr would help here.
 //    m_doc->getComposition().removeObserver(this);
-
-#if 0
-// ??? Memory leaks anyone?
-    delete m_layout;
-    delete m_recordSigMapper;
-    delete m_muteSigMapper;
-    delete m_clickedSigMapper;
-    delete m_instListSigMapper;
-    // ??? There are plenty more "new"s throughout that look suspicious.
-#endif
 }
 
 void
@@ -1023,21 +1013,6 @@
 #endif
 
 void
-TrackButtons::setMuteButton(TrackId trackId, bool mute)
-{
-    Track *track = m_doc->getComposition().getTrackById(trackId);
-
-    if (!track)
-        return;
-
-    int pos = track->getPosition();
-
-    //RG_DEBUG << "TrackButtons::setMuteButton() trackId = " << trackId << ", pos = " << pos;
-
-    m_muteLeds[pos]->setState(mute ? Led::Off : Led::On);
-}
-
-void
 TrackButtons::slotTPBInstrumentSelected(TrackId trackId, int instrumentIndex)
 {
     //RG_DEBUG << "TrackButtons::slotTPBInstrumentSelected( trackId =" << trackId << ", instrumentIndex =" << instrumentIndex << ")";

Modified: trunk/rosegarden/src/gui/editors/segment/TrackButtons.h
===================================================================
--- trunk/rosegarden/src/gui/editors/segment/TrackButtons.h	2012-02-23 00:35:27 UTC (rev 12837)
+++ trunk/rosegarden/src/gui/editors/segment/TrackButtons.h	2012-02-24 00:17:15 UTC (rev 12838)
@@ -111,9 +111,6 @@
     /// Select the given track.  This displays it with a highlight.
     void selectTrack(int position);
 
-    /// Set the mute button (LED) state for a specific track.
-    void setMuteButton(TrackId id, bool mute);
-
     /// Fill the instrument popup menu with the available instruments.
     /**
      * @see RosegardenMainWindow::slotPopulateTrackInstrumentPopup()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.