mirror of
https://github.com/cookiengineer/audacity
synced 2025-12-26 14:41:14 +01:00
Attempt #2 at taming the meter toolbars
It corrects several "multiple project" problems with the meter toolbars and meters. In addition, there was a "multiple project" issue where the transport buttons didn't disable properly in the non-active project.
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include <wx/panel.h>
|
||||
#include <wx/timer.h>
|
||||
|
||||
#include "../Project.h"
|
||||
#include "../SampleFormat.h"
|
||||
#include "../Sequence.h"
|
||||
#include "Ruler.h"
|
||||
@@ -102,7 +103,8 @@ class Meter : public wxPanel
|
||||
};
|
||||
|
||||
|
||||
Meter(wxWindow* parent, wxWindowID id,
|
||||
Meter(AudacityProject *,
|
||||
wxWindow* parent, wxWindowID id,
|
||||
bool isInput,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -179,7 +181,7 @@ class Meter : public wxPanel
|
||||
void OnSize(wxSizeEvent &evt);
|
||||
void OnMouse(wxMouseEvent &evt);
|
||||
|
||||
void OnAudioIOMonitor(wxCommandEvent &evt);
|
||||
void OnAudioIOStatus(wxCommandEvent &evt);
|
||||
|
||||
void OnMeterUpdate(wxTimerEvent &evt);
|
||||
|
||||
@@ -212,6 +214,7 @@ class Meter : public wxPanel
|
||||
void CreateIcon(int aquaOffset);
|
||||
wxFont GetFont();
|
||||
|
||||
AudacityProject *mProject;
|
||||
MeterUpdateQueue mQueue;
|
||||
wxTimer mTimer;
|
||||
|
||||
@@ -236,6 +239,8 @@ class Meter : public wxPanel
|
||||
|
||||
bool mMonitoring;
|
||||
|
||||
bool mActive;
|
||||
|
||||
int mNumBars;
|
||||
MeterBar mBar[kMaxMeterBars];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user