Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24826
Modified Files:
ControlToolBar.cpp ControlToolBar.h
Log Message:
Add "Always Enable Play"
Index: ControlToolBar.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ControlToolBar.h 25 Apr 2007 03:43:36 -0000 1.3
+++ ControlToolBar.h 3 Jun 2007 18:44:22 -0000 1.4
@@ -117,7 +117,8 @@
// Maybe button state values shouldn't be duplicated in this toolbar?
bool mPaused; //Play or record is paused or not paused?
bool mAlwaysEnablePause;
-
+ bool mAlwaysEnablePlay;
+
// Activate ergonomic order for transport buttons
bool mErgonomicTransportButtons;
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ControlToolBar.cpp 27 May 2007 09:06:11 -0000 1.15
+++ ControlToolBar.cpp 3 Jun 2007 18:44:22 -0000 1.16
@@ -89,6 +89,7 @@
gPrefs->Read(wxT("/GUI/ErgonomicTransportButtons"),
&mErgonomicTransportButtons, true);
gPrefs->Read(wxT("/Batch/CleanSpeechMode"), &mCleanSpeechMode, false);
gPrefs->Read(wxT("/GUI/AlwaysEnablePause"), &mAlwaysEnablePause, false);
+ gPrefs->Read(wxT("/GUI/AlwaysEnablePlay"), &mAlwaysEnablePlay, true);
}
ControlToolBar::~ControlToolBar()
@@ -206,6 +207,7 @@
void ControlToolBar::UpdatePrefs()
{
+ gPrefs->Read(wxT("/GUI/AlwaysEnablePlay"), &mAlwaysEnablePlay, true);
#if 0
gPrefs->Read(wxT("/GUI/AlwaysEnablePause"), &mAlwaysEnablePause, false);
@@ -637,12 +639,18 @@
void ControlToolBar::PlayDefault()
{
+ if(mAlwaysEnablePlay)
+ StopPlaying();
+
if(mPlay->WasControlDown())
PlayCurrentRegion(false, true); /* play with cut preview */
else if(mPlay->WasShiftDown())
PlayCurrentRegion(true); /* play looped */
else
PlayCurrentRegion(false); /* play normal */
+
+ if(mAlwaysEnablePlay)
+ mPlay->PopUp();
}
void ControlToolBar::StopPlaying()
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
