Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11448
Modified Files:
Tag: Audacity_UmixIt
AColor.cpp AColor.h Audacity.h Branding.h
Log Message:
build-flag branding
Index: Audacity.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.2
retrieving revision 1.20.2.17.2.3
diff -u -d -r1.20.2.17.2.2 -r1.20.2.17.2.3
--- Audacity.h 2 Feb 2007 01:36:06 -0000 1.20.2.17.2.2
+++ Audacity.h 22 Mar 2007 02:10:18 -0000 1.20.2.17.2.3
@@ -17,7 +17,7 @@
#define __AUDACITY_H__
// Increment this every time you release a new version
-#define AUDACITY_VERSION_STRING "1.2.6 (customized for UmixIt)"
+#define AUDACITY_VERSION_STRING "1.2.6 (UmixIt)"
// Increment this every time the prefs need to be reset
// the first part (before the r) indicates the version the reset took place
@@ -28,6 +28,8 @@
// in an irrevocable way
#define AUDACITY_FILE_FORMAT_VERSION "1.1.0"
+#include "AudacityBranding.h"
+
class wxWindow;
class ToolBarStub;
Index: AColor.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AColor.h,v
retrieving revision 1.5.2.2.2.2
retrieving revision 1.5.2.2.2.3
diff -u -d -r1.5.2.2.2.2 -r1.5.2.2.2.3
--- AColor.h 10 Feb 2007 04:06:52 -0000 1.5.2.2.2.2
+++ AColor.h 22 Mar 2007 02:10:18 -0000 1.5.2.2.2.3
@@ -17,6 +17,8 @@
#include <wx/brush.h>
#include <wx/pen.h>
+#include "AudacityBranding.h"
+
class wxDC;
class wxRect;
@@ -42,8 +44,10 @@
static void LightMIDIChannel(wxDC * dc, int channel /* 1 - 16 */ );
static void DarkMIDIChannel(wxDC * dc, int channel /* 1 - 16 */ );
- // rainbow pastel color based on track's pointer -- so it's unique to track
- static wxColour GetTrackColor(void* pTrack); //vvv UmixIt
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ // rainbow pastel color based on track's pointer -- so it's unique to
track
+ static wxColour GetTrackColor(void* pTrack);
+ #endif
static wxBrush lightBrush[2];
static wxBrush mediumBrush[2];
@@ -59,10 +63,11 @@
static wxBrush muteBrush[2];
static wxBrush soloBrush;
- //vvv UmixIt
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
// For UmixIt, need color brush for off positions, too.
static wxBrush muteBrushOff;
static wxBrush soloBrushOff;
+ #endif
static wxPen envelopePen;
static wxPen WideEnvelopePen;
Index: Branding.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/Branding.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- Branding.h 26 Feb 2007 08:06:06 -0000 1.1.2.3
+++ Branding.h 22 Mar 2007 02:10:18 -0000 1.1.2.4
@@ -13,7 +13,6 @@
#pragma once
-#include "Audacity.h"
#include "xml/XMLTagHandler.h"
#include <wx/filename.h>
Index: AColor.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AColor.cpp,v
retrieving revision 1.10.2.6.2.2
retrieving revision 1.10.2.6.2.3
diff -u -d -r1.10.2.6.2.2 -r1.10.2.6.2.3
--- AColor.cpp 1 Mar 2007 02:28:18 -0000 1.10.2.6.2.2
+++ AColor.cpp 22 Mar 2007 02:10:16 -0000 1.10.2.6.2.3
@@ -12,12 +12,15 @@
**********************************************************************/
#include <wx/dc.h>
-#include <wx/dynarray.h> //vvv UmixIt
#include <wx/settings.h>
#include <wx/utils.h>
#include "AColor.h"
+#if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ #include <wx/dynarray.h>
+#endif
+
bool AColor::inited = false;
wxBrush AColor::lightBrush[2];
wxBrush AColor::mediumBrush[2];
@@ -33,10 +36,11 @@
wxBrush AColor::muteBrush[2];
wxBrush AColor::soloBrush;
-// For UmixIt, need color brush for off positions, too.
-wxBrush AColor::muteBrushOff;
-wxBrush AColor::soloBrushOff;
-
+#if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ // For UmixIt, need color brush for off positions, too.
+ wxBrush AColor::muteBrushOff;
+ wxBrush AColor::soloBrushOff;
+#endif
wxBrush AColor::envelopeBrush;
wxPen AColor::envelopePen;
@@ -135,7 +139,11 @@
}
else {
dc->SetPen(*wxTRANSPARENT_PEN);
- dc->SetBrush(muteBrushOff); //vvv UmixIt
dc->SetBrush(mediumBrush[index]);
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ dc->SetBrush(muteBrushOff);
+ #else
+ dc->SetBrush(mediumBrush[index]);
+ #endif
}
}
@@ -150,7 +158,11 @@
}
else {
dc->SetPen(*wxTRANSPARENT_PEN);
- dc->SetBrush(soloBrushOff); //vvv UmixIt
dc->SetBrush(mediumBrush[index]);
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ dc->SetBrush(soloBrushOff);
+ #else
+ dc->SetBrush(mediumBrush[index]);
+ #endif
}
}
@@ -204,21 +216,23 @@
labelSelectedPen.SetColour(148, 148, 170);
// muteBrush[1] is used when solo is on, since solo overrides mute.
-// muteBrush[0].SetColour(110, 220, 110);
-// muteBrush[1].SetColour(170, 180, 170);
-// soloBrush.SetColour(255, 140, 140);
- // Colors modified to avoid using reserved colors red and green.
- //muteBrush[0].SetColour(160, 170, 210);
- //muteBrush[1].SetColour(160, 170, 190);
- //soloBrush.SetColour(160, 170, 210);
- //vvv UmixIt mute & solo colors
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
+ // UmixIt mute & solo colors
muteBrush[0].SetColour(220, 220, 0); // darker yellow
muteBrush[1].SetColour(200, 200, 0); // dark yellow
soloBrush.SetColour(0, 220, 0); // darker green
muteBrushOff.SetColour(255, 255, 0); // yellow
soloBrushOff.SetColour(0, 255, 0); // green
-
+ #else
+ // muteBrush[0].SetColour(110, 220, 110);
+ // muteBrush[1].SetColour(170, 180, 170);
+ // soloBrush.SetColour(255, 140, 140);
+ // Colors modified to avoid using reserved colors red and green.
+ muteBrush[0].SetColour(160, 170, 210);
+ muteBrush[1].SetColour(160, 170, 190);
+ soloBrush.SetColour(160, 170, 210);
+ #endif
cursorPen.SetColour(0, 0, 0);
// indicatorPen[0].SetColour(255, 0, 51); //recording
@@ -367,7 +381,7 @@
}
-//vvv UmixIt
+#if (AUDACITY_BRANDING == BRAND_UMIXIT)
WX_DEFINE_ARRAY(void*, trackPtrsArray);
const wxColour gRed = wxColour(255, 130, 140); // red
const wxColour gOrange = wxColour(255, 200, 130); // orange
@@ -395,7 +409,7 @@
}
return gRed;
}
-
+#endif
void GetColorGradient(float value,
bool selected,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
