Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11463
Modified Files:
Menus.h Menus.cpp
Log Message:
Fix Stereo To Mono processing when other non-stereo tracks exist or where the
selected stereo track is not the first track in the list.
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- Menus.h 1 Oct 2006 07:23:49 -0000 1.91
+++ Menus.h 12 Oct 2006 04:13:50 -0000 1.92
@@ -270,7 +270,6 @@
void OnStereoToMono(int index);
void ResolveEffectIndices(EffectArray *effects);
wxString BuildCleanFileName(wxString fileName);
-wxUint32 GetTrackFlags();
int mNormalizeIndex;
int mStereoToMonoIndex;
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- Menus.cpp 10 Oct 2006 07:09:44 -0000 1.284
+++ Menus.cpp 12 Oct 2006 04:13:50 -0000 1.285
@@ -1051,8 +1051,6 @@
if (mViewInfo.sel1 > mViewInfo.sel0)
flags |= TimeSelectedFlag;
- flags |= GetTrackFlags();
-
TrackListIterator iter(mTracks);
Track *t = iter.First();
while (t) {
@@ -1062,6 +1060,8 @@
flags |= LabelTracksExistFlag;
if( t->GetSelected() )
{
+ flags |= TracksSelectedFlag;
+
LabelTrack *lt = ( LabelTrack* )t;
for( int i = 0; i < lt->GetNumLabels(); i++ )
{
@@ -1072,14 +1072,21 @@
break;
}
}
+
+ if (((LabelTrack *)t)->IsTextClipSupported())
+ flags |= TextClipFlag;
}
}
- if (t->GetSelected()) {
- flags |= TracksSelectedFlag;
- if (t->GetKind() == Track::Wave && t->GetLinked() == false)
- flags |= WaveTracksSelectedFlag;
- if (t->GetKind() == Track::Label && ((LabelTrack
*)t)->IsTextClipSupported())
- flags |= TextClipFlag;
+ else if (t->GetKind() == Track::Wave) {
+ if (t->GetSelected()) {
+ flags |= TracksSelectedFlag;
+ if (t->GetLinked()) {
+ flags |= StereoRequiredFlag;
+ }
+ else {
+ flags |= WaveTracksSelectedFlag;
+ }
+ }
}
t = iter.Next();
}
@@ -1115,38 +1122,9 @@
return flags;
}
-wxUint32 AudacityProject::GetTrackFlags()
-{
- wxUint32 flags = 0;
-
- TrackListIterator iter(mTracks);
- Track *t = iter.First();
- if (t != 0) {
- flags |= TracksExistFlag;
- if (t->GetKind() == Track::Label) {
- flags |= LabelTracksExistFlag;
- }
- if (t->GetSelected()) {
- flags |= TracksSelectedFlag;
- if (t->GetKind() == Track::Wave && t->GetLinked() == false) {
- flags |= WaveTracksSelectedFlag;
- }
- }
- Track *secondTrack = iter.Next();
- Track *thirdTrack = 0;
- if (secondTrack != 0) {
- thirdTrack = iter.Next();
- }
- if ((secondTrack != 0) && (thirdTrack == 0)) {
- flags |= StereoRequiredFlag;
- }
- }
- return flags;
-}
-
void AudacityProject::SelectAllIfNone()
{
- wxUint32 flags = GetTrackFlags();
+ wxUint32 flags = GetUpdateFlags();
if((flags & TracksSelectedFlag) ==0)
OnSelectAll();
}
@@ -1924,7 +1902,7 @@
count++;
t = iter.Next();
}
-
+
if (count == 0) {
// No tracks were selected...
if (f->GetEffectFlags() & INSERT_EFFECT) {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
