smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 23:46:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixed snapshot dialog annoyance.

Browse source 
Hilight current snapshot in snapshot list with asterisks.
Crash fix in sndfilesource dtor from brianahr.  Thanks!
Fixed COREAUDIO compilation.


git-svn-id: svn://localhost/ardour2/trunk@1066 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-11-03 04:27:58 +00:00
parent 45d35d0732
commit d2d243ad08
5 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View file

@ -1433,7 +1433,6 @@ ARDOUR_UI::snapshot_session ()
prompter.set_name ("Prompter");
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
prompter.set_prompt (_("Name of New Snapshot"));
prompter.set_initial_text (now);

12
gtk2_ardour/editor.cc
View file

@ -4004,7 +4004,17 @@ Editor::redisplay_snapshots ()
for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
string statename = *(*i);
TreeModel::Row row = *(snapshot_display_model->append());
row[snapshot_display_columns.visible_name] = statename;
// we don't have a way of changing the rendering in just one TreeView
// cell so just put an asterisk on each side of the name for now.
string display_name;
if (statename == session->snap_name()) {
display_name = "*"+statename+"*";
} else {
display_name = statename;
}
row[snapshot_display_columns.visible_name] = display_name;
row[snapshot_display_columns.real_name] = statename;
}

4
gtk2_ardour/redirect_box.cc
View file

@ -973,7 +973,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
} else {
ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
}
plugin_ui->set_title (RedirectBox::generate_redirect_title (plugin_insert));
plugin_ui->set_title (generate_redirect_title (plugin_insert));
plugin_insert->set_gui (plugin_ui);
// change window title when route name is changed
@ -1234,7 +1234,7 @@ RedirectBox::route_name_changed (void* src, PluginUIWindow* plugin_ui, boost::sh
{
ENSURE_GUI_THREAD(bind (mem_fun (*this, &RedirectBox::route_name_changed), src, plugin_ui, pi));
plugin_ui->set_title (RedirectBox::generate_redirect_title (pi));
plugin_ui->set_title (generate_redirect_title (pi));
}
string

4
libs/ardour/sndfilesource.cc
View file

@ -179,6 +179,8 @@ SndFileSource::init (string idstr)
string::size_type pos;
string file;
// lets try to keep the object initalizations here at the top
xfade_buf = 0;
interleave_buf = 0;
interleave_bufsize = 0;
sf = 0;
@ -213,7 +215,7 @@ SndFileSource::init (string idstr)
if (destructive()) {
xfade_buf = new Sample[xfade_frames];
timeline_position = header_position_offset;
}
}
AudioFileSource::HeaderPositionOffsetChanged.connect (mem_fun (*this, &SndFileSource::handle_header_position_change));
}

16
libs/ardour/source_factory.cc
View file

@ -122,16 +122,14 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f
} else {
catch (failed_constructor& err) {
boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags));
if (setup_peakfile (ret)) {
return boost::shared_ptr<Source>();
}
if (announce) {
SourceCreated (ret);
}
return ret;
boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags));
if (setup_peakfile (ret)) {
return boost::shared_ptr<Source>();
}
if (announce) {
SourceCreated (ret);
}
return ret;
}
return boost::shared_ptr<Source>();