Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30512
Modified Files:
SelectionBar.h SelectionBar.cpp
Log Message:
Fixes possible negative values in the "End" time control.
Index: SelectionBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/SelectionBar.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SelectionBar.cpp 3 Jul 2007 20:05:17 -0000 1.13
+++ SelectionBar.cpp 4 Jul 2007 10:04:49 -0000 1.14
@@ -79,7 +79,7 @@
SelectionBar::SelectionBar()
: ToolBar(SelectionBarID, _("Selection"), wxT("Selection")),
mStart(0.0), mEnd(0.0), mAudio(0.0),
- mModifyingSelection(false), mLeftTime(NULL)
+ mLeftTime(NULL)
{
}
@@ -286,9 +286,7 @@
else
mEnd = mStart + right;
- mModifyingSelection = true;
mListener->AS_ModifySelection(mStart, mEnd);
- mModifyingSelection = false;
}
void SelectionBar::OnLeftTime(wxCommandEvent &evt)
@@ -374,13 +372,6 @@
void SelectionBar::SetTimes(double start, double end, double audio)
{
- if (mModifyingSelection) {
- // This event is directly a result of the user typing a change,
- // so we ignore it - otherwise every time they type it changes the
- // field out from under them!
- return;
- }
-
mStart = start;
mEnd = end;
mAudio = audio;
Index: SelectionBar.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/SelectionBar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SelectionBar.h 18 Jun 2007 16:10:54 -0000 1.4
+++ SelectionBar.h 4 Jul 2007 10:04:49 -0000 1.5
@@ -89,7 +89,6 @@
double mRate;
double mStart, mEnd, mAudio;
wxString mField[10];
- bool mModifyingSelection;
TimeTextCtrl *mLeftTime;
TimeTextCtrl *mRightTime;
-------------------------------------------------------------------------
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
