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

Use commands for most of the buttons in the audio box and add hotkey support 

Originally committed to SVN as r5233.
This commit is contained in:
Thomas Goyne 2011-01-17 23:54:05 +00:00
parent f79c9e57a0
commit e0051e09e3
8 changed files with 137 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

440
aegisub/src/audio_box.cpp
View File

@ -39,7 +39,6 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <math.h> #include <math.h>
#include <wx/recguard.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/tglbtn.h> #include <wx/tglbtn.h>
#include <wx/laywin.h> // Keep this last so wxSW_3D is set. #include <wx/laywin.h> // Keep this last so wxSW_3D is set.
@ -47,72 +46,61 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "include/aegisub/audio_player.h"
#include "selection_controller.h" #include "selection_controller.h"
#include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_controller.h"
#include "audio_display.h" #include "audio_display.h"
#include "audio_karaoke.h" #include "audio_karaoke.h"
#include "audio_timing.h" #include "audio_timing.h"
#include "frame_main.h" #include "command/command.h"
#include "include/aegisub/audio_player.h" #include "include/aegisub/context.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "main.h" #include "main.h"
#include "toggle_bitmap.h" #include "toggle_bitmap.h"
#include "tooltip_manager.h" #include "tooltip_manager.h"
#include "utils.h"
enum AudioBoxControlIDs { enum AudioBoxControlIDs {
Audio_Scrollbar = 1600, Audio_Scrollbar = 1600,
Audio_Horizontal_Zoom, Audio_Horizontal_Zoom,
Audio_Vertical_Zoom, Audio_Vertical_Zoom,
Audio_Volume, Audio_Volume,
Audio_Sash,
Audio_Vertical_Link,
Audio_Button_Play,
Audio_Button_Stop,
Audio_Button_Prev,
Audio_Button_Next,
Audio_Button_Play_500ms_Before,
Audio_Button_Play_500ms_After,
Audio_Button_Play_500ms_First,
Audio_Button_Play_500ms_Last,
Audio_Button_Play_Row,
Audio_Button_Play_To_End,
Audio_Button_Commit,
Audio_Button_Karaoke, Audio_Button_Karaoke,
Audio_Button_Goto, Audio_Button_Goto,
Audio_Button_Join, /// Karaoke -> Enter join mode. Audio_Button_Join, /// Karaoke -> Enter join mode.
Audio_Button_Split, /// Karaoke -> Enter split mode. Audio_Button_Split, /// Karaoke -> Enter split mode.
Audio_Button_Accept, /// Karaoke -> Split/Join mode -> Accept. Audio_Button_Accept, /// Karaoke -> Split/Join mode -> Accept.
Audio_Button_Cancel, /// KAraoke -> Split/Join mode -> Cancel. Audio_Button_Cancel /// Karaoke -> Split/Join mode -> Cancel.
Audio_Button_Leadin,
Audio_Button_Leadout,
Audio_Check_AutoCommit,
Audio_Check_NextCommit,
Audio_Check_AutoGoto,
Audio_Check_Medusa,
Audio_Check_Spectrum
}; };
static void add_button(wxWindow *parent, wxSizer *sizer, int border, const char *command) {
cmd::Command *c = cmd::get(command);
wxBitmapButton *btn = new wxBitmapButton(parent, cmd::id(command), *c->Icon(16));
ToolTipManager::Bind(btn, c->StrHelp(), "Audio", command);
sizer->Add(btn, 0, wxRIGHT, border);
}
static void add_option(wxWindow *parent, wxSizer *sizer, int border, const char *command, const char *option) {
cmd::Command *c = cmd::get(command);
ToggleBitmap *btn = new ToggleBitmap(parent, cmd::id(command), *c->Icon(16), wxSize(20, -1));
ToolTipManager::Bind(btn, c->StrHelp(), "Audio", command);
btn->SetValue(OPT_GET(option)->GetBool());
sizer->Add(btn, 0, wxRIGHT | wxALIGN_CENTER | wxEXPAND, border);
}
/// @brief Constructor /// @brief Constructor
/// @param parent /// @param parent
/// ///
AudioBox::AudioBox(wxWindow *parent, AudioController *_controller, SelectionController<AssDialogue> *selection_controller, AssFile *ass) AudioBox::AudioBox(wxWindow *parent, agi::Context *context)
: wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISED) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_RAISED)
, selection_controller(selection_controller) , audioDisplay(new AudioDisplay(this, context->audioController))
, controller(_controller) , controller(context->audioController)
, timing_controller_dialogue(CreateDialogueTimingController(controller, context->selectionController, context->ass))
, context(context)
, karaokeMode(false)
{ {
// Setup
karaokeMode = false;
// Sash and Display
audioDisplay = new AudioDisplay(this, controller);
// Zoom // Zoom
HorizontalZoom = new wxSlider(this,Audio_Horizontal_Zoom,0,-50,30,wxDefaultPosition,wxSize(-1,20),wxSL_VERTICAL|wxSL_BOTH); HorizontalZoom = new wxSlider(this,Audio_Horizontal_Zoom,0,-50,30,wxDefaultPosition,wxSize(-1,20),wxSL_VERTICAL|wxSL_BOTH);
HorizontalZoom->SetToolTip(_("Horizontal zoom")); HorizontalZoom->SetToolTip(_("Horizontal zoom"));
@ -125,9 +113,6 @@ AudioBox::AudioBox(wxWindow *parent, AudioController *_controller, SelectionCont
VolumeBar->SetValue(VerticalZoom->GetValue()); VolumeBar->SetValue(VerticalZoom->GetValue());
VolumeBar->Enable(false); VolumeBar->Enable(false);
} }
VerticalLink = new ToggleBitmap(this,Audio_Vertical_Link,GETIMAGE(toggle_audio_link_16));
VerticalLink->SetToolTip(_("Link vertical zoom and volume sliders"));
VerticalLink->SetValue(link);
// VertVol sider // VertVol sider
wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL); wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL);
@ -135,80 +120,44 @@ AudioBox::AudioBox(wxWindow *parent, AudioController *_controller, SelectionCont
VertVol->Add(VolumeBar,1,wxEXPAND,0); VertVol->Add(VolumeBar,1,wxEXPAND,0);
wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL); wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL);
VertVolArea->Add(VertVol,1,wxEXPAND,0); VertVolArea->Add(VertVol,1,wxEXPAND,0);
VertVolArea->Add(VerticalLink,0,wxEXPAND,0);
add_option(this, VertVolArea, 0, "audio/opt/vertical_link", "Audio/Link");
OPT_SUB("Audio/Link", bind(&AudioBox::OnVerticalLink, this, std::tr1::placeholders::_1));
// Top sizer // Top sizer
TopSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *TopSizer = new wxBoxSizer(wxHORIZONTAL);
TopSizer->Add(audioDisplay,1,wxEXPAND,0); TopSizer->Add(audioDisplay,1,wxEXPAND,0);
TopSizer->Add(HorizontalZoom,0,wxEXPAND,0); TopSizer->Add(HorizontalZoom,0,wxEXPAND,0);
TopSizer->Add(VertVolArea,0,wxEXPAND,0); TopSizer->Add(VertVolArea,0,wxEXPAND,0);
// Buttons sizer // Buttons sizer
wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
wxButton *temp; add_button(this, ButtonSizer, 0, "time/prev");
temp = new wxBitmapButton(this,Audio_Button_Prev,GETIMAGE(button_prev_16),wxDefaultPosition,wxDefaultSize); add_button(this, ButtonSizer, 0, "time/next");
ToolTipManager::Bind(temp,_("Previous line or syllable"), "Audio", "time/prev"); add_button(this, ButtonSizer, 0, "audio/play/selection");
ButtonSizer->Add(temp,0,wxRIGHT,0); add_button(this, ButtonSizer, 10, "audio/stop");
temp = new wxBitmapButton(this,Audio_Button_Next,GETIMAGE(button_next_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Next line/syllable"), "Audio", "time/next");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Play,GETIMAGE(button_playsel_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Play selection"), "Audio", "audio/play/selection");
ButtonSizer->Add(temp,0,wxRIGHT,0);
/// @todo does this make any sense with default-commit?
temp = new wxBitmapButton(this,Audio_Button_Play_Row,GETIMAGE(button_playline_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Play current line"), "Audio", "Audio Play Original Line");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Stop,GETIMAGE(button_stop_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Stop"), "Audio", "audio/stop");
ButtonSizer->Add(temp,0,wxRIGHT,10);
temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Before,GETIMAGE(button_playfivehbefore_16),wxDefaultPosition,wxDefaultSize); add_button(this, ButtonSizer, 0, "audio/play/selection/before");
ToolTipManager::Bind(temp,_("Play 500 ms before selection"), "Audio", "audio/play/selection/before"); add_button(this, ButtonSizer, 0, "audio/play/selection/after");
ButtonSizer->Add(temp,0,wxRIGHT,0); add_button(this, ButtonSizer, 0, "audio/play/selection/begin");
temp = new wxBitmapButton(this,Audio_Button_Play_500ms_After,GETIMAGE(button_playfivehafter_16),wxDefaultPosition,wxDefaultSize); add_button(this, ButtonSizer, 0, "audio/play/selection/end");
ToolTipManager::Bind(temp,_("Play 500 ms after selection"), "Audio", "audio/play/selection/after"); add_button(this, ButtonSizer, 10, "audio/play/to_end");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Play_500ms_First,GETIMAGE(button_playfirstfiveh_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Play first 500ms of selection"), "Audio", "audio/play/selection/begin");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Last,GETIMAGE(button_playlastfiveh_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Play last 500ms of selection"), "Audio", "audio/play/selection/end");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Play_To_End,GETIMAGE(button_playtoend_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Play from selection start to end of file"), "Audio", "audio/play/to_end");
ButtonSizer->Add(temp,0,wxRIGHT,10);
temp = new wxBitmapButton(this,Audio_Button_Leadin,GETIMAGE(button_leadin_16),wxDefaultPosition,wxDefaultSize); add_button(this, ButtonSizer, 0, "time/lead/in");
ToolTipManager::Bind(temp,_("Add lead in"), "Audio", "time/lead/in"); add_button(this, ButtonSizer, 10, "time/lead/out");
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Leadout,GETIMAGE(button_leadout_16),wxDefaultPosition,wxDefaultSize);
ToolTipManager::Bind(temp,_("Add lead out"), "Audio", "time/lead/out");
ButtonSizer->Add(temp,0,wxRIGHT,10);
temp = new wxBitmapButton(this,Audio_Button_Commit,GETIMAGE(button_audio_commit_16),wxDefaultPosition,wxDefaultSize); add_button(this, ButtonSizer, 0, "audio/commit");
ToolTipManager::Bind(temp,_("Commit changes"), "Audio", "audio/commit"); wxButton *temp = new wxBitmapButton(this,Audio_Button_Goto,GETIMAGE(button_audio_goto_16));
ButtonSizer->Add(temp,0,wxRIGHT,0);
temp = new wxBitmapButton(this,Audio_Button_Goto,GETIMAGE(button_audio_goto_16),wxDefaultPosition,wxDefaultSize);
temp->SetToolTip(_("Go to selection")); temp->SetToolTip(_("Go to selection"));
ButtonSizer->Add(temp,0,wxRIGHT,10); ButtonSizer->Add(temp,0,wxRIGHT,10);
AutoCommit = new ToggleBitmap(this,Audio_Check_AutoCommit,GETIMAGE(toggle_audio_autocommit_16), wxSize(20, -1)); add_option(this, ButtonSizer, 0, "audio/opt/autocommit", "Audio/Auto/Commit");
AutoCommit->SetToolTip(_("Automatically commit all changes")); add_option(this, ButtonSizer, 0, "audio/opt/autonext", "Audio/Next Line on Commit");
AutoCommit->SetValue(OPT_GET("Audio/Auto/Commit")->GetBool()); add_option(this, ButtonSizer, 10, "audio/opt/autoscroll", "Audio/Auto/Scroll");
ButtonSizer->Add(AutoCommit,0,wxRIGHT | wxALIGN_CENTER | wxEXPAND,0);
NextCommit = new ToggleBitmap(this,Audio_Check_NextCommit,GETIMAGE(toggle_audio_nextcommit_16), wxSize(20, -1));
NextCommit->SetToolTip(_("Auto goes to next line on commit"));
NextCommit->SetValue(OPT_GET("Audio/Next Line on Commit")->GetBool());
ButtonSizer->Add(NextCommit,0,wxRIGHT | wxALIGN_CENTER | wxEXPAND,0);
AutoScroll = new ToggleBitmap(this,Audio_Check_AutoGoto,GETIMAGE(toggle_audio_autoscroll_16), wxSize(20, -1));
AutoScroll->SetToolTip(_("Auto scrolls audio display to selected line"));
AutoScroll->SetValue(OPT_GET("Audio/Auto/Scroll")->GetBool());
ButtonSizer->Add(AutoScroll,0,wxRIGHT | wxALIGN_CENTER | wxEXPAND,10);
ButtonSizer->AddStretchSpacer(1); ButtonSizer->AddStretchSpacer(1);
KaraokeButton = new wxBitmapToggleButton(this,Audio_Button_Karaoke,GETIMAGE(kara_mode_16),wxDefaultPosition,wxDefaultSize); KaraokeButton = new wxBitmapToggleButton(this,Audio_Button_Karaoke,GETIMAGE(kara_mode_16));
KaraokeButton->SetToolTip(_("Toggle karaoke mode")); KaraokeButton->SetToolTip(_("Toggle karaoke mode"));
ButtonSizer->Add(KaraokeButton,0,wxRIGHT|wxEXPAND,0); ButtonSizer->Add(KaraokeButton,0,wxRIGHT|wxEXPAND,0);
@ -216,17 +165,17 @@ AudioBox::AudioBox(wxWindow *parent, AudioController *_controller, SelectionCont
karaokeSizer = new wxBoxSizer(wxHORIZONTAL); karaokeSizer = new wxBoxSizer(wxHORIZONTAL);
JoinSplitSizer = new wxBoxSizer(wxHORIZONTAL); JoinSplitSizer = new wxBoxSizer(wxHORIZONTAL);
JoinButton = new wxBitmapButton(this,Audio_Button_Join,GETIMAGE(kara_join_16),wxDefaultPosition,wxDefaultSize); JoinButton = new wxBitmapButton(this,Audio_Button_Join,GETIMAGE(kara_join_16));
JoinButton->SetToolTip(_("Join selected syllables")); JoinButton->SetToolTip(_("Join selected syllables"));
SplitButton = new wxBitmapButton(this,Audio_Button_Split,GETIMAGE(kara_split_16),wxDefaultPosition,wxDefaultSize); SplitButton = new wxBitmapButton(this,Audio_Button_Split,GETIMAGE(kara_split_16));
SplitButton->SetToolTip(_("Enter split-mode")); SplitButton->SetToolTip(_("Enter split-mode"));
JoinSplitSizer->Add(JoinButton,0,wxRIGHT|wxEXPAND,0); JoinSplitSizer->Add(JoinButton,0,wxRIGHT|wxEXPAND,0);
JoinSplitSizer->Add(SplitButton,0,wxRIGHT|wxEXPAND,0); JoinSplitSizer->Add(SplitButton,0,wxRIGHT|wxEXPAND,0);
CancelAcceptSizer = new wxBoxSizer(wxHORIZONTAL); CancelAcceptSizer = new wxBoxSizer(wxHORIZONTAL);
CancelButton = new wxBitmapButton(this,Audio_Button_Cancel,GETIMAGE(kara_split_accept_16),wxDefaultPosition,wxDefaultSize); CancelButton = new wxBitmapButton(this,Audio_Button_Cancel,GETIMAGE(kara_split_accept_16));
CancelButton->SetToolTip(_("Commit splits and leave split-mode")); CancelButton->SetToolTip(_("Commit splits and leave split-mode"));
AcceptButton = new wxBitmapButton(this,Audio_Button_Accept,GETIMAGE(kara_split_cancel_16),wxDefaultPosition,wxDefaultSize); AcceptButton = new wxBitmapButton(this,Audio_Button_Accept,GETIMAGE(kara_split_cancel_16));
AcceptButton->SetToolTip(_("Discard all splits and leave split-mode")); AcceptButton->SetToolTip(_("Discard all splits and leave split-mode"));
CancelAcceptSizer->Add(CancelButton,0,wxRIGHT|wxEXPAND,0); CancelAcceptSizer->Add(CancelButton,0,wxRIGHT|wxEXPAND,0);
CancelAcceptSizer->Add(AcceptButton,0,wxRIGHT|wxEXPAND,0); CancelAcceptSizer->Add(AcceptButton,0,wxRIGHT|wxEXPAND,0);
@ -240,65 +189,50 @@ AudioBox::AudioBox(wxWindow *parent, AudioController *_controller, SelectionCont
karaokeSizer->Add(audioKaraoke,1,wxEXPAND,0); karaokeSizer->Add(audioKaraoke,1,wxEXPAND,0);
// Main sizer // Main sizer
MainSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(TopSizer,1,wxEXPAND|wxALL,3); MainSizer->Add(TopSizer,1,wxEXPAND|wxALL,3);
MainSizer->Add(ButtonSizer,0,wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT,3); MainSizer->Add(ButtonSizer,0,wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT,3);
//MainSizer->Add(new wxStaticLine(this),0,wxEXPAND|wxTOP|wxBOTTOM,2);
MainSizer->Add(karaokeSizer,0,wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT,3); MainSizer->Add(karaokeSizer,0,wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT,3);
MainSizer->AddSpacer(3); MainSizer->AddSpacer(3);
//MainSizer->SetSizeHints(this);
SetSizer(MainSizer); SetSizer(MainSizer);
SetKaraokeButtons(); // Decide which one to show or hide. SetKaraokeButtons(); // Decide which one to show or hide.
timing_controller_dialogue = CreateDialogueTimingController(controller, selection_controller, ass);
controller->SetTimingController(timing_controller_dialogue); controller->SetTimingController(timing_controller_dialogue);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &AudioBox::OnCommand, this);
Bind(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, &AudioBox::OnCommand, this);
} }
/// @brief Destructor /// @brief Destructor
/// ///
AudioBox::~AudioBox() AudioBox::~AudioBox()
{ {
} }
///////////////
// Event table
BEGIN_EVENT_TABLE(AudioBox,wxPanel) BEGIN_EVENT_TABLE(AudioBox,wxPanel)
EVT_COMMAND_SCROLL(Audio_Horizontal_Zoom, AudioBox::OnHorizontalZoom) EVT_COMMAND_SCROLL(Audio_Horizontal_Zoom, AudioBox::OnHorizontalZoom)
EVT_COMMAND_SCROLL(Audio_Vertical_Zoom, AudioBox::OnVerticalZoom) EVT_COMMAND_SCROLL(Audio_Vertical_Zoom, AudioBox::OnVerticalZoom)
EVT_COMMAND_SCROLL(Audio_Volume, AudioBox::OnVolume) EVT_COMMAND_SCROLL(Audio_Volume, AudioBox::OnVolume)
EVT_BUTTON(Audio_Button_Play, AudioBox::OnPlaySelection)
EVT_BUTTON(Audio_Button_Play_Row, AudioBox::OnPlayDialogue)
EVT_BUTTON(Audio_Button_Stop, AudioBox::OnStop)
EVT_BUTTON(Audio_Button_Next, AudioBox::OnNext)
EVT_BUTTON(Audio_Button_Prev, AudioBox::OnPrev)
EVT_BUTTON(Audio_Button_Play_500ms_Before, AudioBox::OnPlay500Before)
EVT_BUTTON(Audio_Button_Play_500ms_After, AudioBox::OnPlay500After)
EVT_BUTTON(Audio_Button_Play_500ms_First, AudioBox::OnPlay500First)
EVT_BUTTON(Audio_Button_Play_500ms_Last, AudioBox::OnPlay500Last)
EVT_BUTTON(Audio_Button_Play_To_End, AudioBox::OnPlayToEnd)
EVT_BUTTON(Audio_Button_Commit, AudioBox::OnCommit)
EVT_BUTTON(Audio_Button_Goto, AudioBox::OnGoto) EVT_BUTTON(Audio_Button_Goto, AudioBox::OnGoto)
EVT_BUTTON(Audio_Button_Join,AudioBox::OnJoin) EVT_BUTTON(Audio_Button_Join,AudioBox::OnJoin)
EVT_BUTTON(Audio_Button_Split,AudioBox::OnSplit) EVT_BUTTON(Audio_Button_Split,AudioBox::OnSplit)
EVT_BUTTON(Audio_Button_Cancel,AudioBox::OnCancel) EVT_BUTTON(Audio_Button_Cancel,AudioBox::OnCancel)
EVT_BUTTON(Audio_Button_Accept,AudioBox::OnAccept) EVT_BUTTON(Audio_Button_Accept,AudioBox::OnAccept)
EVT_BUTTON(Audio_Button_Leadin,AudioBox::OnLeadIn)
EVT_BUTTON(Audio_Button_Leadout,AudioBox::OnLeadOut)
EVT_TOGGLEBUTTON(Audio_Vertical_Link, AudioBox::OnVerticalLink)
EVT_TOGGLEBUTTON(Audio_Button_Karaoke, AudioBox::OnKaraoke) EVT_TOGGLEBUTTON(Audio_Button_Karaoke, AudioBox::OnKaraoke)
EVT_TOGGLEBUTTON(Audio_Check_AutoGoto,AudioBox::OnAutoGoto)
EVT_TOGGLEBUTTON(Audio_Check_AutoCommit,AudioBox::OnAutoCommit)
EVT_TOGGLEBUTTON(Audio_Check_NextCommit,AudioBox::OnNextLineCommit)
END_EVENT_TABLE() END_EVENT_TABLE()
void AudioBox::OnCommand(wxCommandEvent &event) {
if (event.GetId() < Audio_Scrollbar) {
cmd::call(context, event.GetId());
audioDisplay->SetFocus();
}
else {
event.Skip();
}
}
/// @brief Horizontal zoom bar changed /// @brief Horizontal zoom bar changed
/// @param event /// @param event
@ -309,192 +243,31 @@ void AudioBox::OnHorizontalZoom(wxScrollEvent &event) {
audioDisplay->SetZoomLevel(-event.GetPosition()); audioDisplay->SetZoomLevel(-event.GetPosition());
} }
/// @brief Vertical zoom bar changed
/// @param event
///
void AudioBox::OnVerticalZoom(wxScrollEvent &event) { void AudioBox::OnVerticalZoom(wxScrollEvent &event) {
int pos = event.GetPosition(); int pos = mid(1, event.GetPosition(), 100);
if (pos < 1) pos = 1; double value = pow(pos / 50.0, 3);
if (pos > 100) pos = 100;
float value = pow(float(pos)/50.0f,3);
audioDisplay->SetAmplitudeScale(value); audioDisplay->SetAmplitudeScale(value);
if (VerticalLink->GetValue()) { if (!VolumeBar->IsEnabled()) {
controller->SetVolume(value);
VolumeBar->SetValue(pos); VolumeBar->SetValue(pos);
controller->SetVolume(value);
} }
} }
/// @brief Volume bar changed
/// @param event
///
void AudioBox::OnVolume(wxScrollEvent &event) { void AudioBox::OnVolume(wxScrollEvent &event) {
if (!VerticalLink->GetValue()) { int pos = mid(1, event.GetPosition(), 100);
int pos = event.GetPosition(); controller->SetVolume(pow(pos / 50.0, 3));
if (pos < 1) pos = 1;
if (pos > 100) pos = 100;
controller->SetVolume(pow(float(pos)/50.0f,3));
}
} }
void AudioBox::OnVerticalLink(agi::OptionValue const& opt) {
if (opt.GetBool()) {
/// @brief Bars linked/unlinked int pos = mid(1, VerticalZoom->GetValue(), 100);
/// @param event double value = pow(pos / 50.0, 3);
///
void AudioBox::OnVerticalLink(wxCommandEvent &event) {
int pos = VerticalZoom->GetValue();
if (pos < 1) pos = 1;
if (pos > 100) pos = 100;
float value = pow(float(pos)/50.0f,3);
if (VerticalLink->GetValue()) {
controller->SetVolume(value); controller->SetVolume(value);
VolumeBar->SetValue(pos); VolumeBar->SetValue(pos);
} }
VolumeBar->Enable(!VerticalLink->GetValue()); VolumeBar->Enable(!opt.GetBool());
OPT_SET("Audio/Link")->SetBool(VerticalLink->GetValue());
} }
/// @brief Play selection
/// @param event
///
void AudioBox::OnPlaySelection(wxCommandEvent &event) {
controller->PlayPrimaryRange();
}
/// @brief Play dialogue
/// @param event
///
void AudioBox::OnPlayDialogue(wxCommandEvent &event) {
if (controller->GetTimingController())
controller->GetTimingController()->Revert();
controller->PlayPrimaryRange();
}
/// @brief Stop Playing
/// @param event
///
void AudioBox::OnStop(wxCommandEvent &event) {
controller->Stop();
}
/// @brief Next
/// @param event
///
void AudioBox::OnNext(wxCommandEvent &event) {
//audioDisplay->SetFocus();
controller->Stop();
if (controller->GetTimingController())
controller->GetTimingController()->Next();
controller->PlayPrimaryRange();
}
/// @brief Previous
/// @param event
///
void AudioBox::OnPrev(wxCommandEvent &event) {
//audioDisplay->SetFocus();
controller->Stop();
if (controller->GetTimingController())
controller->GetTimingController()->Prev();
controller->PlayPrimaryRange();
}
/// @brief 500 ms before
/// @param event
///
void AudioBox::OnPlay500Before(wxCommandEvent &event) {
SampleRange times(controller->GetPrimaryPlaybackRange());
controller->PlayRange(SampleRange(
times.begin() - controller->SamplesFromMilliseconds(500),
times.begin()));
}
/// @brief 500 ms after
/// @param event
///
void AudioBox::OnPlay500After(wxCommandEvent &event) {
SampleRange times(controller->GetPrimaryPlaybackRange());
controller->PlayRange(SampleRange(
times.end(),
times.end() + controller->SamplesFromMilliseconds(500)));
}
/// @brief First 500 ms
/// @param event
///
void AudioBox::OnPlay500First(wxCommandEvent &event) {
SampleRange times(controller->GetPrimaryPlaybackRange());
controller->PlayRange(SampleRange(
times.begin(),
times.begin() + std::min(
controller->SamplesFromMilliseconds(500),
times.length())));
}
/// @brief Last 500 ms
/// @param event
///
void AudioBox::OnPlay500Last(wxCommandEvent &event) {
SampleRange times(controller->GetPrimaryPlaybackRange());
controller->PlayRange(SampleRange(
times.end() - std::min(
controller->SamplesFromMilliseconds(500),
times.length()),
times.end()));
}
/// @brief Start to end of file
/// @param event
///
void AudioBox::OnPlayToEnd(wxCommandEvent &event) {
controller->PlayToEnd(controller->GetPrimaryPlaybackRange().begin());
}
/// @brief Commit changes
/// @param event
/// @return
///
void AudioBox::OnCommit(wxCommandEvent &event) {
LOG_D("audio/box") << "OnCommit";
audioDisplay->SetFocus();
LOG_D("audio/box") << "has set focus, now committing changes";
controller->GetTimingController()->Commit();
LOG_D("audio/box") << "returning";
}
/// @brief Toggle karaoke
/// @param event
/// @return
///
void AudioBox::OnKaraoke(wxCommandEvent &event) { void AudioBox::OnKaraoke(wxCommandEvent &event) {
LOG_D("audio/box") << "OnKaraoke"; LOG_D("audio/box") << "OnKaraoke";
audioDisplay->SetFocus(); audioDisplay->SetFocus();
@ -559,7 +332,7 @@ void AudioBox::OnJoin(wxCommandEvent &event) {
void AudioBox::OnSplit(wxCommandEvent &event) { void AudioBox::OnSplit(wxCommandEvent &event) {
LOG_D("audio/box") << "split"; LOG_D("audio/box") << "split";
audioDisplay->SetFocus(); audioDisplay->SetFocus();
audioKaraoke->BeginSplit(); audioKaraoke->BeginSplit();
} }
/// @brief Cancel join/split in karaoke mode. /// @brief Cancel join/split in karaoke mode.
@ -589,64 +362,3 @@ void AudioBox::OnGoto(wxCommandEvent &event) {
if (controller->GetTimingController()) if (controller->GetTimingController())
audioDisplay->ScrollSampleRangeInView(controller->GetTimingController()->GetIdealVisibleSampleRange()); audioDisplay->ScrollSampleRangeInView(controller->GetTimingController()->GetIdealVisibleSampleRange());
} }
/// @brief Auto Goto
/// @param event
///
void AudioBox::OnAutoGoto(wxCommandEvent &event) {
audioDisplay->SetFocus();
OPT_SET("Audio/Auto/Scroll")->SetBool(AutoScroll->GetValue());
}
/// @brief Auto Commit
/// @param event
///
void AudioBox::OnAutoCommit(wxCommandEvent &event) {
audioDisplay->SetFocus();
OPT_SET("Audio/Auto/Commit")->SetBool(AutoCommit->GetValue());
}
/// @brief Next line on Commit
/// @param event
///
void AudioBox::OnNextLineCommit(wxCommandEvent &event) {
audioDisplay->SetFocus();
OPT_SET("Audio/Next Line on Commit")->SetBool(NextCommit->GetValue());
}
/// @todo Put global audio hotkeys toggling into the menu bar
/*
void AudioBox::OnMedusaMode(wxCommandEvent &event) {
audioDisplay->SetFocus();
OPT_SET("Audio/Medusa Timing Hotkeys")->SetBool(MedusaMode->GetValue());
frameMain->SetAccelerators();
}
*/
/// @brief Lead in/out
/// @param event
///
void AudioBox::OnLeadIn(wxCommandEvent &event) {
audioDisplay->SetFocus();
//audioDisplay->AddLead(true,false);
}
/// @brief DOCME
/// @param event
///
void AudioBox::OnLeadOut(wxCommandEvent &event) {
audioDisplay->SetFocus();
//audioDisplay->AddLead(false,true);
}

83
aegisub/src/audio_box.h
View File

@ -37,9 +37,6 @@
#pragma once #pragma once
///////////
// Headers
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/bmpbuttn.h> #include <wx/bmpbuttn.h>
#include <wx/button.h> #include <wx/button.h>
@ -54,20 +51,15 @@
#include <wx/tglbtn.h> #include <wx/tglbtn.h>
#endif #endif
//////////////
// Prototypes
class AudioController; class AudioController;
class AssDialogue;
class AssFile;
class AudioTimingController;
class AudioDisplay; class AudioDisplay;
class AudioKaraoke; class AudioKaraoke;
class FrameMain; class AudioTimingController;
class SubtitlesGrid;
class wxToggleButton;
class ToggleBitmap; class ToggleBitmap;
namespace agi {
struct Context;
class OptionValue;
}
/// @class AudioBox /// @class AudioBox
/// @brief Panel with audio playback and timing controls, also containing an AudioDisplay /// @brief Panel with audio playback and timing controls, also containing an AudioDisplay
@ -75,12 +67,15 @@ class AudioBox : public wxPanel {
/// The audio display in the box /// The audio display in the box
AudioDisplay *audioDisplay; AudioDisplay *audioDisplay;
/// Selection controller used for timing controllers /// The controller controlling this audio box
SelectionController<AssDialogue> *selection_controller; AudioController *controller;
/// The regular dialogue timing controller /// The regular dialogue timing controller
AudioTimingController *timing_controller_dialogue; AudioTimingController *timing_controller_dialogue;
/// Project context this operates on
agi::Context *context;
/// DOCME /// DOCME
wxSlider *HorizontalZoom; wxSlider *HorizontalZoom;
@ -90,21 +85,6 @@ class AudioBox : public wxPanel {
/// DOCME /// DOCME
wxSlider *VolumeBar; wxSlider *VolumeBar;
/// DOCME
wxSizer *MainSizer;
/// DOCME
wxSizer *TopSizer;
/// DOCME
wxSizer *sashSizer;
/// DOCME
wxSizer *DisplaySizer;
/// DOCME
ToggleBitmap *VerticalLink;
/// Karaoke box sizer /// Karaoke box sizer
wxSizer *karaokeSizer; wxSizer *karaokeSizer;
@ -126,49 +106,19 @@ class AudioBox : public wxPanel {
/// Cancel/Accept sizer. /// Cancel/Accept sizer.
wxSizer *CancelAcceptSizer; wxSizer *CancelAcceptSizer;
/// DOCME
ToggleBitmap *AutoScroll;
/// DOCME
ToggleBitmap *NextCommit;
/// DOCME
ToggleBitmap *AutoCommit;
void OnHorizontalZoom(wxScrollEvent &event); void OnHorizontalZoom(wxScrollEvent &event);
void OnVerticalZoom(wxScrollEvent &event); void OnVerticalZoom(wxScrollEvent &event);
void OnVolume(wxScrollEvent &event); void OnVolume(wxScrollEvent &event);
void OnVerticalLink(wxCommandEvent &event); void OnVerticalLink(agi::OptionValue const& opt);
void OnPlaySelection(wxCommandEvent &event);
void OnPlayDialogue(wxCommandEvent &event);
void OnStop(wxCommandEvent &event);
void OnNext(wxCommandEvent &event);
void OnPrev(wxCommandEvent &event);
void OnPlay500Before(wxCommandEvent &event);
void OnPlay500After(wxCommandEvent &event);
void OnPlay500First(wxCommandEvent &event);
void OnPlay500Last(wxCommandEvent &event);
void OnPlayToEnd(wxCommandEvent &event);
void OnCommit(wxCommandEvent &event);
void OnKaraoke(wxCommandEvent &event); void OnKaraoke(wxCommandEvent &event);
void OnJoin(wxCommandEvent &event); void OnJoin(wxCommandEvent &event);
void OnSplit(wxCommandEvent &event); void OnSplit(wxCommandEvent &event);
void OnCancel(wxCommandEvent &event); void OnCancel(wxCommandEvent &event);
void OnAccept(wxCommandEvent &event); void OnAccept(wxCommandEvent &event);
void OnGoto(wxCommandEvent &event); void OnGoto(wxCommandEvent &event);
void OnLeadIn(wxCommandEvent &event);
void OnLeadOut(wxCommandEvent &event);
void OnAutoGoto(wxCommandEvent &event); void OnCommand(wxCommandEvent &event);
void OnAutoCommit(wxCommandEvent &event);
void OnNextLineCommit(wxCommandEvent &event);
public:
/// The controller controlling this audio box
AudioController *controller;
/// DOCME /// DOCME
AudioKaraoke *audioKaraoke; AudioKaraoke *audioKaraoke;
@ -176,18 +126,15 @@ public:
/// DOCME /// DOCME
wxBitmapToggleButton *KaraokeButton; wxBitmapToggleButton *KaraokeButton;
/// DOCME
FrameMain *frameMain;
/// DOCME /// DOCME
bool karaokeMode; bool karaokeMode;
AudioBox(wxWindow *parent, AudioController *controller, SelectionController<AssDialogue> *selection_controller, AssFile *ass); public:
AudioBox(wxWindow *parent, agi::Context *context);
~AudioBox(); ~AudioBox();
void SetKaraokeButtons(); void SetKaraokeButtons();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

14
aegisub/src/audio_display.cpp
View File

@ -45,18 +45,19 @@
#include <wx/mousestate.h> #include <wx/mousestate.h>
#endif #endif
#include "block_cache.h"
#include "selection_controller.h"
#include "ass_time.h" #include "ass_time.h"
#include "audio_colorscheme.h" #include "audio_colorscheme.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "audio_display.h" #include "audio_display.h"
#include "block_cache.h"
#include "audio_renderer.h" #include "audio_renderer.h"
#include "audio_renderer_spectrum.h" #include "audio_renderer_spectrum.h"
#include "audio_renderer_waveform.h" #include "audio_renderer_waveform.h"
#include "selection_controller.h"
#include "audio_timing.h" #include "audio_timing.h"
#include "include/aegisub/audio_provider.h"
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "include/aegisub/hotkey.h"
#include "main.h" #include "main.h"
#include "utils.h" #include "utils.h"
@ -788,6 +789,7 @@ BEGIN_EVENT_TABLE(AudioDisplay, wxWindow)
EVT_SIZE(AudioDisplay::OnSize) EVT_SIZE(AudioDisplay::OnSize)
EVT_SET_FOCUS(AudioDisplay::OnFocus) EVT_SET_FOCUS(AudioDisplay::OnFocus)
EVT_KILL_FOCUS(AudioDisplay::OnFocus) EVT_KILL_FOCUS(AudioDisplay::OnFocus)
EVT_KEY_DOWN(AudioDisplay::OnKeyDown)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -1150,6 +1152,12 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
/// @todo Handle middle click to seek video /// @todo Handle middle click to seek video
} }
void AudioDisplay::OnKeyDown(wxKeyEvent& event)
{
hotkey::check("Audio", event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
event.StopPropagation();
}
void AudioDisplay::OnSize(wxSizeEvent &event) void AudioDisplay::OnSize(wxSizeEvent &event)
{ {

2
aegisub/src/audio_display.h
View File

@ -198,6 +198,8 @@ private:
void OnSize(wxSizeEvent &event); void OnSize(wxSizeEvent &event);
/// wxWidgets input focus changed event /// wxWidgets input focus changed event
void OnFocus(wxFocusEvent &event); void OnFocus(wxFocusEvent &event);
/// wxWidgets keypress event
void OnKeyDown(wxKeyEvent& event);
// AudioControllerAudioEventListener implementation // AudioControllerAudioEventListener implementation
virtual void OnAudioOpen(AudioProvider *provider); virtual void OnAudioOpen(AudioProvider *provider);

12
aegisub/src/command/audio.cpp
View File

@ -330,6 +330,17 @@ struct audio_autonext : public Command {
} }
}; };
/// Toggle linked vertical zoom and volume
struct audio_vertical_link : public Command {
CMD_NAME("audio/opt/vertical_link")
STR_MENU("Link vertical zoom and volume sliders")
STR_DISP("Link vertical zoom and volume sliders")
STR_HELP("Link vertical zoom and volume sliders")
void operator()(agi::Context *c) {
toggle("Audio/Link");
}
};
/// @} /// @}
/// Init audio/ commands /// Init audio/ commands
@ -352,6 +363,7 @@ void init_audio(CommandManager *cm) {
cm->reg(new audio_play_to_end); cm->reg(new audio_play_to_end);
cm->reg(new audio_save_clip); cm->reg(new audio_save_clip);
cm->reg(new audio_stop); cm->reg(new audio_stop);
cm->reg(new audio_vertical_link);
cm->reg(new audio_view_spectrum); cm->reg(new audio_view_spectrum);
cm->reg(new audio_view_waveform); cm->reg(new audio_view_waveform);
} }

19
aegisub/src/command/icon.cpp
View File

@ -98,8 +98,20 @@ INSERT_ICON("app/new_window", new_window_menu)
INSERT_ICON("app/options", options_button) INSERT_ICON("app/options", options_button)
INSERT_ICON("app/updates", blank_button) INSERT_ICON("app/updates", blank_button)
INSERT_ICON("audio/close", close_audio_menu) INSERT_ICON("audio/close", close_audio_menu)
INSERT_ICON("audio/commit", button_audio_commit)
INSERT_ICON("audio/open", open_audio_menu) INSERT_ICON("audio/open", open_audio_menu)
INSERT_ICON("audio/open/video", open_audio_from_video_menu) INSERT_ICON("audio/open/video", open_audio_from_video_menu)
INSERT_ICON("audio/opt/autocommit", toggle_audio_autocommit)
INSERT_ICON("audio/opt/autonext", toggle_audio_nextcommit)
INSERT_ICON("audio/opt/autoscroll", toggle_audio_autoscroll)
INSERT_ICON("audio/opt/vertical_link", toggle_audio_link)
INSERT_ICON("audio/play/selection", button_playsel)
INSERT_ICON("audio/play/selection/after", button_playfivehafter)
INSERT_ICON("audio/play/selection/before", button_playfivehbefore)
INSERT_ICON("audio/play/selection/begin", button_playfirstfiveh)
INSERT_ICON("audio/play/selection/end", button_playlastfiveh)
INSERT_ICON("audio/play/to_end", button_playtoend)
INSERT_ICON("audio/stop", button_stop)
INSERT_ICON("edit/line/copy", copy_button) INSERT_ICON("edit/line/copy", copy_button)
INSERT_ICON("edit/line/cut", cut_button) INSERT_ICON("edit/line/cut", cut_button)
INSERT_ICON("edit/line/delete", delete_button) INSERT_ICON("edit/line/delete", delete_button)
@ -144,6 +156,10 @@ INSERT_ICON("subtitle/spellcheck", spellcheck_toolbutton)
INSERT_ICON("time/continous/end", blank_button) INSERT_ICON("time/continous/end", blank_button)
INSERT_ICON("time/continous/start", blank_button) INSERT_ICON("time/continous/start", blank_button)
INSERT_ICON("time/frame/current", shift_to_frame) INSERT_ICON("time/frame/current", shift_to_frame)
INSERT_ICON("time/lead/in", button_leadin)
INSERT_ICON("time/lead/out", button_leadout)
INSERT_ICON("time/next", button_next)
INSERT_ICON("time/prev", button_prev)
INSERT_ICON("time/shift", shift_times_toolbutton) INSERT_ICON("time/shift", shift_times_toolbutton)
INSERT_ICON("time/snap/end_video", subend_to_video) INSERT_ICON("time/snap/end_video", subend_to_video)
INSERT_ICON("time/snap/frame", shift_to_frame) INSERT_ICON("time/snap/frame", shift_to_frame)
@ -177,8 +193,7 @@ INSERT_ICON("video/open/dummy", use_dummy_video_menu)
INSERT_ICON("video/zoom/in", zoom_in_button) INSERT_ICON("video/zoom/in", zoom_in_button)
INSERT_ICON("video/zoom/out", zoom_out_button) INSERT_ICON("video/zoom/out", zoom_out_button)
// Remove the handler to avoid "Duplicate handler" warnings from WX since
// Remove the handler to aboid "Duplicate handler" warnings from WX since
// it will attempt to install all the handlers later on. // it will attempt to install all the handlers later on.
wxImage::RemoveHandler(handler_name); wxImage::RemoveHandler(handler_name);
} }

4
aegisub/src/command/time.cpp
View File

@ -313,7 +313,7 @@ struct time_next : public Command {
CMD_NAME("time/next") CMD_NAME("time/next")
STR_MENU("Next line") STR_MENU("Next line")
STR_DISP("Next line") STR_DISP("Next line")
STR_HELP("Next line") STR_HELP("Next line or syllable")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->audioController->Stop(); c->audioController->Stop();
if (c->audioController->GetTimingController()) if (c->audioController->GetTimingController())
@ -327,7 +327,7 @@ struct time_prev : public Command {
CMD_NAME("time/prev") CMD_NAME("time/prev")
STR_MENU("Previous line") STR_MENU("Previous line")
STR_DISP("Previous line") STR_DISP("Previous line")
STR_HELP("Previous line") STR_HELP("Previous line or syllable")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->audioController->Stop(); c->audioController->Stop();
if (c->audioController->GetTimingController()) if (c->audioController->GetTimingController())

3
aegisub/src/frame_main.cpp
View File

@ -308,8 +308,7 @@ void FrameMain::InitContents() {
audioSash->SetSashVisible(wxSASH_BOTTOM, true); audioSash->SetSashVisible(wxSASH_BOTTOM, true);
StartupLog("Create audio box"); StartupLog("Create audio box");
context->audioBox = audioBox = new AudioBox(audioSash, context->audioController, SubsGrid, context->ass); context->audioBox = audioBox = new AudioBox(audioSash, context.get());
audioBox->frameMain = this;
audioSashSizer->Add(audioBox, 1, wxEXPAND); audioSashSizer->Add(audioBox, 1, wxEXPAND);
audioSash->SetSizer(audioSashSizer); audioSash->SetSizer(audioSashSizer);
audioBox->Fit(); audioBox->Fit();