Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3237/src
Modified Files:
Tag: Audacity_UmixIt
Branding.cpp TrackArtist.cpp WaveTrack.cpp Audacity.h
Log Message:
mods per Audiotouch client
Index: Branding.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/Branding.cpp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- Branding.cpp 11 Jun 2007 22:08:51 -0000 1.1.2.10
+++ Branding.cpp 2 Jul 2009 22:40:36 -0000 1.1.2.11
@@ -218,10 +218,6 @@
&buttonImageUp, &buttonImageUp,
&buttonImageUp, &buttonImageUp, //v other images?
false); // momentary button
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
- if (mMinLeftSectionWidth < buttonImageUp.GetWidth() + kDoubleInset)
- mMinLeftSectionWidth = buttonImageUp.GetWidth() + kDoubleInset;
- #endif
if (mMinHeight < buttonImageUp.GetHeight() + kInset) // height plus
bevel
mMinHeight = buttonImageUp.GetHeight() + kInset;
mProjectLogo_origWidth = buttonImageUp.GetWidth();
Index: Audacity.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.9
retrieving revision 1.20.2.17.2.10
diff -u -d -r1.20.2.17.2.9 -r1.20.2.17.2.10
--- Audacity.h 15 Nov 2008 21:05:13 -0000 1.20.2.17.2.9
+++ Audacity.h 2 Jul 2009 22:40:38 -0000 1.20.2.17.2.10
@@ -20,7 +20,7 @@
// Increment this every time you release a new version
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- #define AUDACITY_VERSION_STRING "1.2.6a6"
+ #define AUDACITY_VERSION_STRING "1.2.6a7"
#elif (AUDACITY_BRANDING == BRAND_UMIXIT)
#define AUDACITY_VERSION_STRING "1.2.6.1"
#else
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.51.2.2.2.8
retrieving revision 1.51.2.2.2.9
diff -u -d -r1.51.2.2.2.8 -r1.51.2.2.2.9
--- WaveTrack.cpp 5 Feb 2009 22:56:35 -0000 1.51.2.2.2.8
+++ WaveTrack.cpp 2 Jul 2009 22:40:38 -0000 1.51.2.2.2.9
@@ -144,11 +144,7 @@
WaveTrack::WaveTrack(WaveTrack &orig):
Track(orig)
{
- #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- this->SetDisplay(WaveformAndSpectrumDisplay); // Move to GUIWaveTrack
- #else
- this->SetDisplay(WaveformDisplay); // Move to GUIWaveTrack
- #endif
+ this->SetDisplay(WaveformDisplay); // Move to GUIWaveTrack
Init(orig);
@@ -663,6 +659,9 @@
// Thinklabs has lower default for Spectrum MaxFreq & bigger FFTSize
than standard Audacity
defaultMaxFreq = 1000;
defaultFFTSize = 4096;
+ #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ defaultMaxFreq = 3000;
+ defaultFFTSize = 4096;
#endif
int windowSize = gPrefs->Read("/Spectrum/FFTSize", defaultFFTSize);
float *buffer = new float[windowSize];
Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.57.2.8.2.5
retrieving revision 1.57.2.8.2.6
diff -u -d -r1.57.2.8.2.5 -r1.57.2.8.2.6
--- TrackArtist.cpp 24 Apr 2007 22:43:55 -0000 1.57.2.8.2.5
+++ TrackArtist.cpp 2 Jul 2009 22:40:37 -0000 1.57.2.8.2.6
@@ -326,6 +326,9 @@
// Thinklabs has lower default for Spectrum MaxFreq & bigger FFTSize
than standard Audacity
defaultMaxFreq = 1000;
defaultFFTSize = 4096;
+ #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ defaultMaxFreq = 3000;
+ defaultFFTSize = 4096;
#endif
int maxFreq = gPrefs->Read("/Spectrum/MaxFreq", defaultMaxFreq);
int windowSize = gPrefs->Read("/Spectrum/FFTSize", defaultFFTSize);
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
