Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5535

Modified Files:
      Tag: Audacity_UmixIt
        WaveTrack.cpp 
Log Message:
Both clients who wanted the combined waveform/spectrum display now want it to 
not be the default.

Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.51.2.2.2.9
retrieving revision 1.51.2.2.2.10
diff -u -d -r1.51.2.2.2.9 -r1.51.2.2.2.10
--- WaveTrack.cpp       2 Jul 2009 22:40:38 -0000       1.51.2.2.2.9
+++ WaveTrack.cpp       15 Sep 2009 22:11:39 -0000      1.51.2.2.2.10
@@ -117,16 +117,7 @@
       rate = (double) gPrefs->
          Read("/SamplingRate/DefaultProjectSampleRate", 
AudioIO::GetOptimalSupportedSampleRate());
    }
-
-   //v 4/22/2007: Clive decided to revert to WaveformDisplay as default.
-   //#if (AUDACITY_BRANDING == BRAND_THINKLABS)
-   //   mDisplay = WaveformAndSpectrumDisplay; // Move to GUIWaveTrack
-   #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
-      this->SetDisplay(WaveformAndSpectrumDisplay); // Move to GUIWaveTrack
-   #else
-      this->SetDisplay(WaveformDisplay); // Move to GUIWaveTrack
-   #endif
-
+   mDisplay = WaveformDisplay; // Move to GUIWaveTrack
    mSequence = new Sequence(projDirManager, format);
    mEnvelope = new Envelope();
    mRate = rate;


------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to