Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to customize the Play selection commands #65

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add option to customize the Play selection commands #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c22e4
Added option to costumize the duration of the "Play x ms before/after…
tabaha Feb 20, 2020
661038b
Cleaned comments
tabaha Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 49 additions & 18 deletions src/command/audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include <libaegisub/audio/provider.h>
#include <libaegisub/make_unique.h>
#include <libaegisub/io.h>
#include <format.h>

namespace {
using cmd::Command;
Expand Down Expand Up @@ -265,58 +266,88 @@ struct audio_stop final : public Command {
struct audio_play_before final : public validate_audio_open {
CMD_NAME("audio/play/selection/before")
CMD_ICON(button_playfivehbefore)
STR_MENU("Play 500 ms before selection")
STR_DISP("Play 500 ms before selection")
STR_HELP("Play 500 ms before selection")
CMD_TYPE(COMMAND_VALIDATE | COMMAND_DYNAMIC_NAME | COMMAND_DYNAMIC_HELP)

wxString StrMenu(const agi::Context* c) const override {
return fmt_tl("Play %d ms before selection", OPT_GET("Audio/Play Selection Duration/Before")->GetInt());
}
wxString StrDisplay(const agi::Context* c) const override {
return fmt_tl("Play %d ms before selection", OPT_GET("Audio/Play Selection Duration/Before")->GetInt());
}
wxString StrHelp() const override {
return fmt_tl("Play %d ms before selection", OPT_GET("Audio/Play Selection Duration/Before")->GetInt());
}

void operator()(agi::Context *c) override {
c->videoController->Stop();
int begin = c->audioController->GetPrimaryPlaybackRange().begin();
c->audioController->PlayRange(TimeRange(begin - 500, begin));
c->audioController->PlayRange(TimeRange(begin - OPT_GET("Audio/Play Selection Duration/Before")->GetInt(), begin));
}
};

struct audio_play_after final : public validate_audio_open {
CMD_NAME("audio/play/selection/after")
CMD_ICON(button_playfivehafter)
STR_MENU("Play 500 ms after selection")
STR_DISP("Play 500 ms after selection")
STR_HELP("Play 500 ms after selection")
CMD_TYPE(COMMAND_VALIDATE | COMMAND_DYNAMIC_NAME | COMMAND_DYNAMIC_HELP)

wxString StrMenu(const agi::Context* c) const override {
return fmt_tl("Play %d ms after selection", OPT_GET("Audio/Play Selection Duration/After")->GetInt());
}
wxString StrDisplay(const agi::Context* c) const override {
return fmt_tl("Play %d ms after selection", OPT_GET("Audio/Play Selection Duration/Before")->GetInt());
}
wxString StrHelp() const override {
return fmt_tl("Play %d ms after selection", OPT_GET("Audio/Play Selection Duration/After")->GetInt());
}

void operator()(agi::Context *c) override {
c->videoController->Stop();
int end = c->audioController->GetPrimaryPlaybackRange().end();
c->audioController->PlayRange(TimeRange(end, end + 500));
c->audioController->PlayRange(TimeRange(end, end + OPT_GET("Audio/Play Selection Duration/After")->GetInt()));
}
};

struct audio_play_end final : public validate_audio_open {
CMD_NAME("audio/play/selection/end")
CMD_ICON(button_playlastfiveh)
STR_MENU("Play last 500 ms of selection")
STR_DISP("Play last 500 ms of selection")
STR_HELP("Play last 500 ms of selection")
CMD_TYPE(COMMAND_VALIDATE | COMMAND_DYNAMIC_NAME | COMMAND_DYNAMIC_HELP)

wxString StrMenu(const agi::Context* c) const override {
return fmt_tl("Play last %d ms of selection", OPT_GET("Audio/Play Selection Duration/End")->GetInt());
}
wxString StrDisplay(const agi::Context* c) const override {
return fmt_tl("Play last %d ms of selection", OPT_GET("Audio/Play Selection Duration/End")->GetInt());
}
wxString StrHelp() const override {
return fmt_tl("Play last %d ms of selection", OPT_GET("Audio/Play Selection Duration/End")->GetInt());
}

void operator()(agi::Context *c) override {
c->videoController->Stop();
TimeRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayToEndOfPrimary(times.end() - std::min(500, times.length()));
c->audioController->PlayToEndOfPrimary(times.end() - std::min((int)OPT_GET("Audio/Play Selection Duration/End")->GetInt(), times.length()));
}
};

struct audio_play_begin final : public validate_audio_open {
CMD_NAME("audio/play/selection/begin")
CMD_ICON(button_playfirstfiveh)
STR_MENU("Play first 500 ms of selection")
STR_DISP("Play first 500 ms of selection")
STR_HELP("Play first 500 ms of selection")
CMD_TYPE(COMMAND_VALIDATE | COMMAND_DYNAMIC_NAME | COMMAND_DYNAMIC_HELP)

wxString StrMenu(const agi::Context* c) const override {
return fmt_tl("Play first %d ms of selection", OPT_GET("Audio/Play Selection Duration/Begin")->GetInt());
}
wxString StrDisplay(const agi::Context* c) const override {
return fmt_tl("Play first %d ms of selection", OPT_GET("Audio/Play Selection Duration/Begin")->GetInt());
}
wxString StrHelp() const override {
return fmt_tl("Play first %d ms of selection", OPT_GET("Audio/Play Selection Duration/Begin")->GetInt());
}

void operator()(agi::Context *c) override {
c->videoController->Stop();
TimeRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayRange(TimeRange(
times.begin(),
times.begin() + std::min(500, times.length())));
c->audioController->PlayRange(TimeRange(times.begin(), times.begin() + std::min((int)OPT_GET("Audio/Play Selection Duration/Begin")->GetInt(), times.length())));
}
};

Expand Down
6 changes: 6 additions & 0 deletions src/libresrc/default_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
"Lock Scroll on Cursor" : false,
"Medusa Timing Hotkeys" : false,
"Next Line on Commit" : true,
"Play Selection Duration" : {
"After" : 500,
"Before" : 500,
"Begin" : 500,
"End" : 500
},
"Player" : "",
"Plays When Stepping Video" : false,
"Provider" : "ffmpegsource",
Expand Down
4 changes: 4 additions & 0 deletions src/preferences.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ void Audio(wxTreebook *book, Preferences *parent) {
p->OptionAdd(general, _("Default timing length (ms)"), "Timing/Default Duration", 0, 36000);
p->OptionAdd(general, _("Default lead-in length (ms)"), "Audio/Lead/IN", 0, 36000);
p->OptionAdd(general, _("Default lead-out length (ms)"), "Audio/Lead/OUT", 0, 36000);
p->OptionAdd(general, _("Play after length (ms)"), "Audio/Play Selection Duration/After", 0, 36000);
p->OptionAdd(general, _("Play before length (ms)"), "Audio/Play Selection Duration/Before", 0, 36000);
p->OptionAdd(general, _("Play from beginning length (ms)"), "Audio/Play Selection Duration/Begin", 0, 36000);
p->OptionAdd(general, _("Play before end length (ms)"), "Audio/Play Selection Duration/End", 0, 36000);

p->OptionAdd(general, _("Marker drag-start sensitivity (px)"), "Audio/Start Drag Sensitivity", 1, 15);
p->OptionAdd(general, _("Line boundary thickness (px)"), "Audio/Line Boundaries Thickness", 1, 5);
Expand Down
14 changes: 14 additions & 0 deletions src/toolbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ namespace {
/// Listener for hotkey change signal
agi::signal::Connection hotkeys_changed_slot;

/// Listeners for duration changed for the 4 play options
agi::signal::Connection audio_play_before_changed_duration;
agi::signal::Connection audio_play_after_changed_duration;
agi::signal::Connection audio_play_begin_changed_duration;
agi::signal::Connection audio_play_end_changed_duration;

/// Enable/disable the toolbar buttons
void OnIdle(wxIdleEvent &) {
for (size_t i = 0; i < commands.size(); ++i) {
Expand Down Expand Up @@ -174,6 +180,10 @@ namespace {
, icon_size(OPT_GET("App/Toolbar Icon Size")->GetInt())
, icon_size_slot(OPT_SUB("App/Toolbar Icon Size", &Toolbar::OnIconSizeChange, this))
, hotkeys_changed_slot(hotkey::inst->AddHotkeyChangeListener(&Toolbar::RegenerateToolbar, this))
, audio_play_before_changed_duration(OPT_SUB("Audio/Play Selection Duration/Before", &Toolbar::RegenerateToolbar, this))
, audio_play_after_changed_duration(OPT_SUB("Audio/Play Selection Duration/After", &Toolbar::RegenerateToolbar, this))
, audio_play_begin_changed_duration(OPT_SUB("Audio/Play Selection Duration/Begin", &Toolbar::RegenerateToolbar, this))
, audio_play_end_changed_duration(OPT_SUB("Audio/Play Selection Duration/End", &Toolbar::RegenerateToolbar, this))
{
Populate();
Bind(wxEVT_TOOL, &Toolbar::OnClick, this);
Expand All @@ -196,6 +206,10 @@ namespace {
}))
#endif
, hotkeys_changed_slot(hotkey::inst->AddHotkeyChangeListener(&Toolbar::RegenerateToolbar, this))
, audio_play_before_changed_duration(OPT_SUB("Audio/Play Selection Duration/Before", &Toolbar::RegenerateToolbar, this))
, audio_play_after_changed_duration(OPT_SUB("Audio/Play Selection Duration/After", &Toolbar::RegenerateToolbar, this))
, audio_play_begin_changed_duration(OPT_SUB("Audio/Play Selection Duration/Begin", &Toolbar::RegenerateToolbar, this))
, audio_play_end_changed_duration(OPT_SUB("Audio/Play Selection Duration/End", &Toolbar::RegenerateToolbar, this))
{
parent->SetToolBar(this);
Populate();
Expand Down