Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16335
Modified Files:
Tag: Audacity_UmixIt
Audacity.h AudacityBranding.h EditToolBar.cpp EditToolBar.h
Menus.cpp Project.cpp
Log Message:
further Audiotouch customizations
Index: Audacity.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.5
retrieving revision 1.20.2.17.2.6
diff -u -d -r1.20.2.17.2.5 -r1.20.2.17.2.6
--- Audacity.h 9 Aug 2007 04:13:31 -0000 1.20.2.17.2.5
+++ Audacity.h 20 Sep 2007 23:17:45 -0000 1.20.2.17.2.6
@@ -20,7 +20,7 @@
// Increment this every time you release a new version
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- #define AUDACITY_VERSION_STRING "1.2.6a3"
+ #define AUDACITY_VERSION_STRING "1.2.6a4"
#else
#define AUDACITY_VERSION_STRING "1.2.6"
#endif
Index: EditToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/EditToolBar.cpp,v
retrieving revision 1.43.2.1.4.2
retrieving revision 1.43.2.1.4.3
diff -u -d -r1.43.2.1.4.2 -r1.43.2.1.4.3
--- EditToolBar.cpp 11 Jun 2007 22:08:51 -0000 1.43.2.1.4.2
+++ EditToolBar.cpp 20 Sep 2007 23:17:45 -0000 1.43.2.1.4.3
@@ -6,6 +6,7 @@
Dominic Mazzoni
Shane T. Mueller
+ Vaughan Johnson
See EditToolBar.h for details
@@ -174,7 +175,7 @@
_("Fit selection in window"));
AddButton(ZoomFit, ZoomFitDisabled, ZoomFitAlpha, ETBZoomFitID,
_("Fit project in window"));
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS) || (AUDACITY_BRANDING ==
BRAND_AUDIOTOUCH)
AddButton(ZoomFitV, ZoomFitVDisabled, ZoomFitVAlpha, ETBZoomFitVertID,
_("Fit project vertically in window"));
#endif
@@ -188,7 +189,7 @@
mButtons[ETBZoomSelID]->SetEnabled(false);
mButtons[ETBZoomFitID]->SetEnabled(false);
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS) || (AUDACITY_BRANDING ==
BRAND_AUDIOTOUCH)
mButtons[ETBZoomFitVertID]->SetEnabled(false);
#endif
mButtons[ETBPasteID]->SetEnabled(false);
@@ -261,7 +262,7 @@
case ETBZoomFitID:
p->OnZoomFit();
break;
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS) || (AUDACITY_BRANDING ==
BRAND_AUDIOTOUCH)
case ETBZoomFitVertID:
p->OnZoomFitV();
break;
@@ -319,7 +320,7 @@
mButtons[ETBZoomSelID]->SetEnabled(selection);
mButtons[ETBZoomFitID]->SetEnabled(tracks);
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS) || (AUDACITY_BRANDING ==
BRAND_AUDIOTOUCH)
mButtons[ETBZoomFitVertID]->SetEnabled(tracks);
#endif
Index: AudacityBranding.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/AudacityBranding.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- AudacityBranding.h 6 Aug 2007 03:55:54 -0000 1.1.2.7
+++ AudacityBranding.h 20 Sep 2007 23:17:45 -0000 1.1.2.8
@@ -27,8 +27,8 @@
#define BRAND_AUDIOTOUCH 3
//#define AUDACITY_BRANDING BRAND_AUDACITY // standard version
-//#define AUDACITY_BRANDING BRAND_UMIXIT
-#define AUDACITY_BRANDING BRAND_THINKLABS
+#define AUDACITY_BRANDING BRAND_UMIXIT
+//#define AUDACITY_BRANDING BRAND_THINKLABS
//#define AUDACITY_BRANDING BRAND_AUDIOTOUCH
#define AUDACITY_URL wxT("http://audacity.sourceforge.net/";)
Index: EditToolBar.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/EditToolBar.h,v
retrieving revision 1.14.6.2
retrieving revision 1.14.6.3
diff -u -d -r1.14.6.2 -r1.14.6.3
--- EditToolBar.h 11 Jun 2007 22:08:51 -0000 1.14.6.2
+++ EditToolBar.h 20 Sep 2007 23:17:45 -0000 1.14.6.3
@@ -63,7 +63,7 @@
ETBZoomSelID,
ETBZoomFitID,
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS) || (AUDACITY_BRANDING ==
BRAND_AUDIOTOUCH)
ETBZoomFitVertID,
#endif
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.12
retrieving revision 1.151.2.26.2.13
diff -u -d -r1.151.2.26.2.12 -r1.151.2.26.2.13
--- Menus.cpp 9 Aug 2007 04:13:31 -0000 1.151.2.26.2.12
+++ Menus.cpp 20 Sep 2007 23:17:45 -0000 1.151.2.26.2.13
@@ -306,7 +306,12 @@
c->AddItem("Trim", _("&Trim\tCtrl+T"),
FN(OnTrim));
c->AddSeparator();
c->AddItem("Delete", _("&Delete\tCtrl+K"),
FN(OnDelete));
- c->AddItem("Silence", _("&Silence\tCtrl+L"),
FN(OnSilence));
+ #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ // Audiotouch uses Ctrl+L for "Add Label At Playback Position" instead
of Silence.
+ c->AddItem("Silence", _("&Silence"), FN(OnSilence));
+ #else
+ c->AddItem("Silence", _("&Silence\tCtrl+L"), FN(OnSilence));
+ #endif
c->AddSeparator();
c->AddItem("Split", _("Spl&it"),
FN(OnSplit));
c->AddItem("Duplicate", _("D&uplicate\tCtrl+D"),
FN(OnDuplicate));
@@ -527,10 +532,11 @@
c->AddSeparator();
c->AddItem("AddLabel", _("Add Label At Selection\tCtrl+B"),
FN(OnAddLabel));
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- // Audiotouch uses Ctrl+M for Save as MP3 (ExportMP3).
- c->AddItem("AddLabelPlaying", _("Add Label At Playback Position"),
FN(OnAddLabelPlaying));
+ // Audiotouch uses Ctrl+M for Save as MP3 (ExportMP3)
+ // and Ctrl+L for "Add Label At Playback Position" instead of Silence.
+ c->AddItem("AddLabelPlaying", _("Add Label At Playback
Position\tCtrl+L"), FN(OnAddLabelPlaying));
#else
- c->AddItem("AddLabelPlaying", _("Add Label At Playback
Position\tCtrl+M"), FN(OnAddLabelPlaying));
+ c->AddItem("AddLabelPlaying", _("Add Label At Playback
Position\tCtrl+M"), FN(OnAddLabelPlaying));
#endif
c->SetCommandFlags("AddLabel", 0, 0);
c->SetCommandFlags("AddLabelPlaying", 0, AudioIONotBusyFlag);
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.178.2.17.2.24
retrieving revision 1.178.2.17.2.25
diff -u -d -r1.178.2.17.2.24 -r1.178.2.17.2.25
--- Project.cpp 9 Aug 2007 04:13:31 -0000 1.178.2.17.2.24
+++ Project.cpp 20 Sep 2007 23:17:45 -0000 1.178.2.17.2.25
@@ -265,6 +265,10 @@
GetDefaultWindowRect(&defWndRect);
+#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ *bMaximized = true;
+ *nextRect = defWndRect;
+#else // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
*bMaximized = false;
if(gAudacityProjects.IsEmpty())
@@ -340,6 +344,7 @@
//Increment Position increment
gAudacityPosInc++;
+#endif // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
}
enum {
@@ -2665,7 +2670,10 @@
// All the different ways to add tracks funnel through here.
#if (AUDACITY_BRANDING == BRAND_THINKLABS)
this->EnforceTrackConstraints();
- #elif (AUDACITY_BRANDING != BRAND_AUDIOTOUCH) // (AUDACITY_BRANDING !=
BRAND_THINKLABS)
+ #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ this->OnZoomFitV();
+ this->OnZoomFit();
+ #else // (AUDACITY_BRANDING != BRAND_THINKLABS) && (AUDACITY_BRANDING !=
BRAND_AUDIOTOUCH)
UpdateLyrics();
UpdateMixerBoard();
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
