Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-04 15:50:10 +01:00
Code Issues Releases Wiki Activity

Previous version did not compile on OS X due to confusion between USE_MIDI and EXPERIMENTAL_MIDI_OUT and some missing includes that didn't bother Visual C++. This revision fixes OS X builds.

Browse Source
This commit is contained in:
rbdannenberg
2010-10-28 21:22:14 +00:00
parent f274c9fb2b
commit 92950e22fd
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MixerBoard.cpp
View File

@@ -118,7 +118,7 @@ MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
{ {
mMixerBoard = grandParent; mMixerBoard = grandParent;
mProject = project; mProject = project;
#ifdef USE_MIDI #ifdef EXPERIMENTAL_MIDI_OUT
if (pLeftTrack->GetKind() == Track::Note) { if (pLeftTrack->GetKind() == Track::Note) {
mLeftTrack = NULL; mLeftTrack = NULL;
mNoteTrack = (NoteTrack*) pLeftTrack; mNoteTrack = (NoteTrack*) pLeftTrack;
@@ -128,6 +128,7 @@ MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
mNoteTrack = NULL; mNoteTrack = NULL;
} }
#else #else
wxASSERT(pLeftTrack->GetKind() == Track::Wave);
mTrack = mLeftTrack = pLeftTrack; mTrack = mLeftTrack = pLeftTrack;
#endif #endif
mRightTrack = pRightTrack; mRightTrack = pRightTrack;
@@ -156,7 +157,7 @@ MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
const int nGainSliderHeight = const int nGainSliderHeight =
size.GetHeight() - ctrlPos.y - kQuadrupleInset; size.GetHeight() - ctrlPos.y - kQuadrupleInset;
ctrlSize.Set(kLeftSideStackWidth - kQuadrupleInset, nGainSliderHeight); ctrlSize.Set(kLeftSideStackWidth - kQuadrupleInset, nGainSliderHeight);
#ifdef USE_MIDI #ifdef EXPERIMENTAL_MIDI_OUT
if (mNoteTrack) { if (mNoteTrack) {
mSlider_Gain = mSlider_Gain =
new MixerTrackSlider( new MixerTrackSlider(
@@ -815,7 +816,7 @@ void MixerBoard::UpdateTrackClusters()
pRightTrack = pLeftTrack->GetLinked() ? iterTracks.Next() : NULL; pRightTrack = pLeftTrack->GetLinked() ? iterTracks.Next() : NULL;
if (pLeftTrack->GetKind() == Track::Wave if (pLeftTrack->GetKind() == Track::Wave
#ifdef USE_MIDI #ifdef EXPERIMENTAL_MIDI_OUT
|| pLeftTrack->GetKind() == Track::Note || pLeftTrack->GetKind() == Track::Note
#endif #endif
) )
@@ -826,7 +827,7 @@ void MixerBoard::UpdateTrackClusters()
// Track clusters are maintained in the same order as the WaveTracks. // Track clusters are maintained in the same order as the WaveTracks.
// Track pointers can change for the "same" track for different states // Track pointers can change for the "same" track for different states
// on the undo stack, so update the pointers and display name. // on the undo stack, so update the pointers and display name.
#ifdef USE_MIDI #ifdef EXPERIMENTAL_MIDI_OUT
if (pLeftTrack->GetKind() == Track::Note) { if (pLeftTrack->GetKind() == Track::Note) {
mMixerTrackClusters[nClusterIndex]->mNoteTrack = (NoteTrack*)pLeftTrack; mMixerTrackClusters[nClusterIndex]->mNoteTrack = (NoteTrack*)pLeftTrack;
mMixerTrackClusters[nClusterIndex]->mLeftTrack = NULL; mMixerTrackClusters[nClusterIndex]->mLeftTrack = NULL;

1
src/NoteTrack.h
View File

@@ -15,6 +15,7 @@
#include "Audacity.h" #include "Audacity.h"
#include "Experimental.h" #include "Experimental.h"
#include "Track.h" #include "Track.h"
#include "effects/TimeWarper.h"
#if defined(USE_MIDI) #if defined(USE_MIDI)

1
src/effects/SoundTouchEffect.cpp
View File

@@ -22,6 +22,7 @@ effect that uses SoundTouch to do its processing (ChangeTempo
#include "../Project.h" #include "../Project.h"
#include "SoundTouchEffect.h" #include "SoundTouchEffect.h"
#include "TimeWarper.h" #include "TimeWarper.h"
#include "NoteTrack.h"
bool EffectSoundTouch::ProcessLabelTrack(Track *track) bool EffectSoundTouch::ProcessLabelTrack(Track *track)
{ {