diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index a9f52e4cd..3523e4d72 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -52,6 +52,7 @@ effects from this one class. #include "../../WaveTrack.h" #include "../../widgets/valnum.h" #include "../../Prefs.h" +#include "../../prefs/WaveformSettings.h" #include "FileDialog.h" @@ -799,14 +800,19 @@ bool NyquistEffect::ProcessOne() wxString type; wxString view; wxString bitFormat; + switch (mCurTrack[0]->GetKind()) { case Track::Wave: type = wxT("wave"); switch (((WaveTrack *) mCurTrack[0])->GetDisplay()) { - case WaveTrack::Waveform: view = wxT("\"Waveform\""); break; - case WaveTrack::Spectrum: view = wxT("\"Spectrum\""); break; + case WaveTrack::Waveform: + view = (mCurTrack[0]->GetWaveformSettings().scaleType == 0) ? wxT("\"Waveform\"") : wxT("\"Waveform (dB)\""); + break; + case WaveTrack::Spectrum: + view = wxT("\"Spectrogram\""); + break; default: view = wxT("NIL"); break; } break; @@ -829,6 +835,7 @@ bool NyquistEffect::ProcessOne() cmd += wxString::Format(wxT("(putprop '*TRACK* %d 'INDEX)\n"), ++mTrackIndex); cmd += wxString::Format(wxT("(putprop '*TRACK* \"%s\" 'NAME)\n"), mCurTrack[0]->GetName().c_str()); cmd += wxString::Format(wxT("(putprop '*TRACK* \"%s\" 'TYPE)\n"), type.c_str()); + // Note: "View" property may change when Audacity's choice of track views has stabilized. cmd += wxString::Format(wxT("(putprop '*TRACK* %s 'VIEW)\n"), view.c_str()); cmd += wxString::Format(wxT("(putprop '*TRACK* %d 'CHANNELS)\n"), mCurNumChannels); cmd += wxString::Format(wxT("(putprop '*TRACK* (float %s) 'START-TIME)\n"),