ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Move Export Audition Buttons to the bottom

This commit is contained in:
Robin Gareus 2016-02-14 17:08:15 +01:00
parent 9527fcd65f
commit b9efb2ae21
2 changed files with 55 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gtk2_ardour/export_report.cc
View File

@ -91,12 +91,9 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
t->attach (*l, 1, 3, 0, 1, FILL, SHRINK);
Button *b = manage (new Button (_("Open Folder")));
t->attach (*b, 3, 4, 0, 1, FILL, SHRINK);
t->attach (*b, 3, 4, 0, 2, FILL, SHRINK);
b->signal_clicked ().connect (sigc::bind (sigc::mem_fun (*this, &ExportReport::open_folder), path));
Button *start_btn = manage (new Button (_("Audition")));
t->attach (*start_btn, 3, 4, 1, 2, FILL, SHRINK);
SoundFileInfo info;
std::string errmsg;
@ -113,6 +110,8 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
start_off = info.timecode;
channels = info.channels;
files.insert (std::make_pair (page, AuditionInfo (path, channels)));
/* File Info Table */
framecnt_t const nfr = _session ? _session->nominal_frame_rate () : 25;
@ -162,12 +161,6 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
t->attach (*l, 1, 4, 1, 2);
}
if (channels > 0 && file_length > 0 && sample_rate > 0 && _session) {
start_btn->signal_clicked ().connect (sigc::bind (sigc::mem_fun (*this, &ExportReport::audition), path, channels, page));
} else {
start_btn->set_sensitive (false);
}
int w, h;
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (get_pango_context ());
@ -624,7 +617,16 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
}
timeline[page] = playhead_widgets;
pages.pages ().push_back (Notebook_Helpers::TabElem (*vb, Glib::path_get_basename (i->first)));
HBox *tab = manage (new HBox ());
l = manage (new Label (Glib::path_get_basename (path)));
Gtk::Image *img = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_MENU));
tab->pack_start (*img);
tab->pack_start (*l);
l->show();
tab->show();
img->hide();
pages.pages ().push_back (Notebook_Helpers::TabElem (*vb, *tab));
pages.signal_switch_page().connect (sigc::mem_fun (*this, &ExportReport::on_switch_page));
}
@ -641,11 +643,13 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
_session->the_auditioner()->AuditionProgress.connect(auditioner_connections, invalidator (*this), boost::bind (&ExportReport::audition_progress, this, _1, _2), gui_context());
}
play_btn = add_button (Stock::MEDIA_PLAY, RESPONSE_ACCEPT);
stop_btn = add_button (Stock::MEDIA_STOP, RESPONSE_ACCEPT);
add_button (Stock::CLOSE, RESPONSE_CLOSE);
set_default_response (RESPONSE_CLOSE);
stop_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::stop_audition));
play_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::play_audition));
stop_btn->set_sensitive (false);
show_all ();
}
@ -676,13 +680,29 @@ void
ExportReport::audition_active (bool active)
{
stop_btn->set_sensitive (active);
if (!active && _audition_num == _page_num) {
play_btn->set_sensitive (!active);
if (!active && _audition_num == _page_num && timeline.find (_audition_num) != timeline.end ()) {
for (std::list<CimgArea*>::const_iterator i = timeline[_audition_num].begin();
i != timeline[_audition_num].end();
++i) {
(*i)->set_playhead (-1);
}
}
if (_audition_num >= 0 ) {
Widget *page = pages.get_nth_page (_audition_num);
HBox *box = static_cast<Gtk::HBox*> (pages.get_tab_label (*page));
if (!active) {
(*(box->get_children().begin()))->hide ();
} else {
(*(box->get_children().begin()))->show ();
}
}
if (!active) {
_audition_num = -1;
}
}
void
@ -691,6 +711,8 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
assert (_session);
_session->cancel_audition();
if (n_chn ==0) { return; }
/* can't really happen, unless the user replaces the file while the dialog is open.. */
if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
PBD::warning << string_compose(_("Could not read file: %1 (%2)."), path, strerror(errno)) << endmsg;
@ -748,10 +770,18 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
_audition_num = page;
}
void
ExportReport::play_audition ()
{
if (_audition_num >= 0 || !_session) { return; }
if (files.find (_page_num) == files.end()) { return; }
audition (files[_page_num].path, files[_page_num].channels, _page_num);
}
void
ExportReport::stop_audition ()
{
if (_audition_num == _page_num) {
if (_audition_num == _page_num && timeline.find (_audition_num) != timeline.end ()) {
for (std::list<CimgArea*>::const_iterator i = timeline[_audition_num].begin();
i != timeline[_audition_num].end();
++i) {
@ -761,7 +791,6 @@ ExportReport::stop_audition ()
if (_session) {
_session->cancel_audition();
}
_audition_num = -1;
}
void
@ -780,7 +809,7 @@ ExportReport::on_switch_page (GtkNotebookPage*, guint page_num)
void
ExportReport::audition_progress (framecnt_t pos, framecnt_t len)
{
if (_audition_num == _page_num) {
if (_audition_num == _page_num && timeline.find (_audition_num) != timeline.end ()) {
const float p = (float)pos / len;
for (std::list<CimgArea*>::const_iterator i = timeline[_audition_num].begin();
i != timeline[_audition_num].end();

11
gtk2_ardour/export_report.h
View File

@ -124,6 +124,7 @@ private:
void open_folder (std::string);
void audition (std::string, unsigned int, int);
void stop_audition ();
void play_audition ();
void audition_active (bool);
void audition_seek (int, float);
void audition_progress (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
@ -133,9 +134,19 @@ private:
Gtk::Notebook pages;
ARDOUR::Session* _session;
Gtk::Button* stop_btn;
Gtk::Button* play_btn;
PBD::ScopedConnectionList auditioner_connections;
struct AuditionInfo {
AuditionInfo (std::string p, unsigned int c) : path (p), channels (c) {}
AuditionInfo () : channels (0) {}
std::string path;
unsigned int channels;
};
std::map<int, std::list<CimgArea*> > timeline;
std::map<int, AuditionInfo> files;
int _audition_num;
int _page_num;
};