From 4e5b81973beca736a63b362f3cfd9b80a639292d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Jun 2014 07:07:12 -0700 Subject: [PATCH] Set the initial audio volume when opening audio --- src/audio_box.cpp | 2 +- src/audio_controller.cpp | 1 + src/audio_controller.h | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/audio_box.cpp b/src/audio_box.cpp index cf9230e6f..1007d9ed8 100644 --- a/src/audio_box.cpp +++ b/src/audio_box.cpp @@ -60,7 +60,7 @@ AudioBox::AudioBox(wxWindow *parent, agi::Context *context) : wxSashWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxSW_3D | wxCLIP_CHILDREN) , controller(context->audioController.get()) , context(context) -, audio_open_connection(context->project->AddAudioProviderListener(&AudioBox::OnAudioOpen, this)) +, audio_open_connection(context->audioController->AddAudioPlayerOpenListener(&AudioBox::OnAudioOpen, this)) , panel(new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_RAISED)) , audioDisplay(new AudioDisplay(panel, context->audioController.get(), context)) , HorizontalZoom(new wxSlider(panel, Audio_Horizontal_Zoom, -OPT_GET("Audio/Zoom/Horizontal")->GetInt(), -50, 30, wxDefaultPosition, wxSize(-1, 20), wxSL_VERTICAL|wxSL_BOTH)) diff --git a/src/audio_controller.cpp b/src/audio_controller.cpp index 487ad39ca..af7964531 100644 --- a/src/audio_controller.cpp +++ b/src/audio_controller.cpp @@ -104,6 +104,7 @@ void AudioController::OnAudioPlayerChanged() { context->project->CloseAudio(); } + AnnounceAudioPlayerOpened(); } void AudioController::OnAudioProvider(AudioProvider *new_provider) diff --git a/src/audio_controller.h b/src/audio_controller.h index 11112c161..2f4c1bbed 100644 --- a/src/audio_controller.h +++ b/src/audio_controller.h @@ -62,6 +62,9 @@ class AudioController final : public wxEvtHandler { /// The timing controller was replaced agi::signal::Signal<> AnnounceTimingControllerChanged; + /// A new audio player was created + agi::signal::Signal<> AnnounceAudioPlayerOpened; + /// The audio output object std::unique_ptr player; @@ -184,6 +187,7 @@ public: DEFINE_SIGNAL_ADDERS(AnnouncePlaybackPosition, AddPlaybackPositionListener) DEFINE_SIGNAL_ADDERS(AnnouncePlaybackStop, AddPlaybackStopListener) DEFINE_SIGNAL_ADDERS(AnnounceTimingControllerChanged, AddTimingControllerListener) + DEFINE_SIGNAL_ADDERS(AnnounceAudioPlayerOpened, AddAudioPlayerOpenListener) }; namespace agi {