iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Set the initial audio volume when opening audio

This commit is contained in:
Thomas Goyne 2014-06-03 07:07:12 -07:00
parent e6d7c4547a
commit 4e5b81973b
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio_box.cpp
View File

@ -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))

1
src/audio_controller.cpp
View File

@ -104,6 +104,7 @@ void AudioController::OnAudioPlayerChanged()
{
context->project->CloseAudio();
}
AnnounceAudioPlayerOpened();
}
void AudioController::OnAudioProvider(AudioProvider *new_provider)

4
src/audio_controller.h
View File

@ -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<AudioPlayer> 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 {