Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8564/effects
Modified Files:
Tag: Audacity_1_3_5-Camp_Jam
ChangePitch.cpp ChangeTempo.cpp ChangeTempo.h
Log Message:
company name change for custom version
Index: ChangeTempo.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.h,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- ChangeTempo.h 20 Nov 2008 22:48:43 -0000 1.12.2.1
+++ ChangeTempo.h 24 Nov 2008 04:22:53 -0000 1.12.2.2
@@ -88,7 +88,7 @@
void OnText_FromBPM(wxCommandEvent & event);
void OnText_ToBPM(wxCommandEvent & event);
void OnText_ToLength(wxCommandEvent & event);
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
void OnRadioButton_50pct(wxCommandEvent & event);
void OnRadioButton_75pct(wxCommandEvent & event);
void OnRadioButton_90pct(wxCommandEvent & event);
@@ -115,7 +115,7 @@
wxTextCtrl * m_pTextCtrl_ToBPM;
wxTextCtrl * m_pTextCtrl_FromLength;
wxTextCtrl * m_pTextCtrl_ToLength;
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
wxRadioButton* m_pRadioButton_50pct;
wxRadioButton* m_pRadioButton_75pct;
wxRadioButton* m_pRadioButton_90pct;
Index: ChangeTempo.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.cpp,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -d -r1.37.2.2 -r1.37.2.3
--- ChangeTempo.cpp 20 Nov 2008 23:57:40 -0000 1.37.2.2
+++ ChangeTempo.cpp 24 Nov 2008 04:22:53 -0000 1.37.2.3
@@ -122,7 +122,7 @@
#define ID_TEXT_TOBPM 10004
#define ID_TEXT_FROMLENGTH 10005
#define ID_TEXT_TOLENGTH 10006
-#if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+#if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
#define ID_RADIOBUTTON_50PCT 10007
#define ID_RADIOBUTTON_75PCT 10008
#define ID_RADIOBUTTON_90PCT 10009
@@ -140,7 +140,7 @@
EVT_TEXT(ID_TEXT_TOBPM, ChangeTempoDialog::OnText_ToBPM)
EVT_TEXT(ID_TEXT_TOLENGTH, ChangeTempoDialog::OnText_ToLength)
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
EVT_RADIOBUTTON(ID_RADIOBUTTON_50PCT,
ChangeTempoDialog::OnRadioButton_50pct)
EVT_RADIOBUTTON(ID_RADIOBUTTON_75PCT,
ChangeTempoDialog::OnRadioButton_75pct)
EVT_RADIOBUTTON(ID_RADIOBUTTON_90PCT,
ChangeTempoDialog::OnRadioButton_90pct)
@@ -168,7 +168,7 @@
m_pTextCtrl_ToBPM = NULL;
m_pTextCtrl_FromLength = NULL;
m_pTextCtrl_ToLength = NULL;
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
m_pRadioButton_50pct = NULL;
m_pRadioButton_75pct = NULL;
m_pRadioButton_90pct = NULL;
@@ -203,7 +203,7 @@
wxDefaultPosition, wxDefaultSize, 0);
pBoxSizer_Dialog->Add(pStaticText, 0, wxALIGN_CENTER | wxBOTTOM | wxLEFT |
wxRIGHT, 8);
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
pBoxSizer_Dialog->AddSpacer(8);
wxBoxSizer * pBoxSizer_RadioButtons = new wxBoxSizer(wxHORIZONTAL);
@@ -236,7 +236,7 @@
pBoxSizer_Dialog->Add(pBoxSizer_RadioButtons, 0, wxALIGN_CENTER | wxALL,
4);
pBoxSizer_Dialog->AddSpacer(8);
- #else // !(AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #else // !(AUDACITY_BRANDING == BRAND_JAMLING__EASY)
// percent change controls
@@ -331,7 +331,7 @@
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
pBoxSizer_Dialog->Add(pBoxSizer_Length, 0, wxALIGN_CENTER | wxALL, 4);
- #endif // (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #endif // (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
// Preview, OK, & Cancel buttons
pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
@@ -541,7 +541,7 @@
}
}
-#if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+#if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
void ChangeTempoDialog::OnRadioButton_50pct(wxCommandEvent &evt)
{
if (m_bLoopDetect)
@@ -583,7 +583,7 @@
this->Update_Text_ToLength();
m_bLoopDetect = false;
}
-#endif // (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+#endif // (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
void ChangeTempoDialog::OnPreview(wxCommandEvent &event)
@@ -603,7 +603,7 @@
if (Validate())
{
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
wxMessageBox(_("To return to previous tempo: Edit menu > Undo."));
#endif
EndModal(true);
Index: ChangePitch.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -d -r1.44.2.1 -r1.44.2.2
--- ChangePitch.cpp 20 Nov 2008 22:48:43 -0000 1.44.2.1
+++ ChangePitch.cpp 24 Nov 2008 04:22:53 -0000 1.44.2.2
@@ -301,7 +301,7 @@
pBoxSizer_Dialog->Add(pBoxSizer_Pitch, 0, wxALIGN_CENTER | wxALL, 4);
- #if (AUDACITY_BRANDING != BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING != BRAND_JAMLING__EASY)
// semitones change controls
wxBoxSizer * pBoxSizer_SemitonesChange = new wxBoxSizer(wxHORIZONTAL);
pStaticText = new wxStaticText(this, -1, _("Semitones (half-steps):"),
@@ -379,7 +379,7 @@
wxDefaultPosition,
wxSize(100, -1), wxSL_HORIZONTAL);
pBoxSizer_Dialog->Add(m_pSlider_PercentChange, 1,
wxGROW | wxALIGN_CENTER | wxLEFT | wxRIGHT, 4);
- #endif // (AUDACITY_BRANDING != BRAND_CAMP_JAM__EASY)
+ #endif // (AUDACITY_BRANDING != BRAND_JAMLING__EASY)
pBoxSizer_Dialog->Add(0, 8, 0); // spacer
@@ -751,7 +751,7 @@
if (Validate())
{
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
wxMessageBox(_("To return to previous key: Edit menu > Undo."));
#endif
EndModal(true);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
