From b134428668ecbc667a0518975c78eece422150e3 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 8 Dec 2010 08:09:25 +0000 Subject: [PATCH] Store the URL of opened audio files Originally committed to SVN as r4908. --- aegisub/src/audio_controller.cpp | 7 +++++-- aegisub/src/audio_controller.h | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp index 1fe946d53..c1eeb09d6 100644 --- a/aegisub/src/audio_controller.cpp +++ b/aegisub/src/audio_controller.cpp @@ -275,6 +275,8 @@ void AudioController::OpenAudio(const wxString &url) throw; } + audio_url = url; + // Tell listeners about this. AnnounceAudioOpen(provider); } @@ -289,6 +291,8 @@ void AudioController::CloseAudio() player = 0; provider = 0; + audio_url.clear(); + AnnounceAudioClose(); } @@ -301,8 +305,7 @@ bool AudioController::IsAudioOpen() const wxString AudioController::GetAudioURL() const { - /// @todo figure out how to get the url - return _T(""); + return audio_url; } void AudioController::SetTimingController(AudioTimingController *new_controller) diff --git a/aegisub/src/audio_controller.h b/aegisub/src/audio_controller.h index b3f615de3..f2408a143 100644 --- a/aegisub/src/audio_controller.h +++ b/aegisub/src/audio_controller.h @@ -179,6 +179,9 @@ private: /// Provide keyframe data for audio displays agi::scoped_ptr keyframes_marker_provider; + /// The URL of the currently open audio, if any + wxString audio_url; + enum PlaybackMode { PM_NotPlaying,