smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 21:56:30 +01:00
Code Issues Projects Releases Wiki Activity

fix crash bug caused by incorrectly setting transience of audio clocks in the SoundFileBox

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2496 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-09-27 19:45:47 +00:00
parent d78b48c0ff
commit 2859868109
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_audio_import.cc
View file

@ -74,7 +74,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
}
if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, 0, mode_hint);
sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, 0, true, mode_hint);
} else {
sfbrowser->set_mode (mode_hint);
}
@ -107,7 +107,7 @@ Editor::external_audio_dialog ()
}
if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, track_cnt);
sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, track_cnt, true);
} else {
sfbrowser->reset (track_cnt);
}

19
gtk2_ardour/sfdb_ui.cc
View file

@ -96,13 +96,15 @@ importmode2string (ImportMode mode)
case ImportAsTapeTrack:
return _("as new tape tracks");
}
/*NOTREACHED*/
return _("as new tracks");
}
SoundFileBox::SoundFileBox ()
SoundFileBox::SoundFileBox (bool persistent)
: _session(0),
table (6, 2),
length_clock ("sfboxLengthClock", false, "EditCursorClock", false, true, false),
timecode_clock ("sfboxTimecodeClock", false, "EditCursorClock", false, false, false),
length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, true, false),
timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false),
main_box (false, 6),
autoplay_btn (_("Auto-play"))
@ -381,12 +383,14 @@ SoundFileBox::save_tags (const vector<string>& tags)
Library->save_changes ();
}
SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s)
SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s, bool persistent)
: ArdourDialog (parent, title, false, false),
found_list (ListStore::create(found_list_columns)),
chooser (FILE_CHOOSER_ACTION_OPEN),
found_list_view (found_list),
preview (persistent),
found_search_btn (_("Search"))
{
VBox* vbox;
HBox* hbox;
@ -928,7 +932,7 @@ SoundFileOmega::check_link_status (const Session& s, const vector<ustring>& path
}
SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::Session* s)
: SoundFileBrowser (parent, title, s)
: SoundFileBrowser (parent, title, s, false)
{
set_size_request (780, 300);
chooser.set_select_multiple (false);
@ -964,8 +968,9 @@ SoundFileChooser::get_filename ()
return paths.front();
}
SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, Editing::ImportMode mode_hint)
: SoundFileBrowser (parent, title, s),
SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, bool persistent,
Editing::ImportMode mode_hint)
: SoundFileBrowser (parent, title, s, persistent),
copy_files_btn ( _("Copy files to session")),
selected_track_cnt (selected_tracks)
{

6
gtk2_ardour/sfdb_ui.h
View file

@ -52,7 +52,7 @@ class GainMeter;
class SoundFileBox : public Gtk::VBox
{
public:
SoundFileBox ();
SoundFileBox (bool persistent);
virtual ~SoundFileBox () {};
void set_session (ARDOUR::Session* s);
@ -118,7 +118,7 @@ class SoundFileBrowser : public ArdourDialog
Glib::RefPtr<Gtk::ListStore> found_list;
public:
SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s);
SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent);
virtual ~SoundFileBrowser ();
virtual void set_session (ARDOUR::Session*);
@ -184,7 +184,7 @@ class SoundFileOmega : public SoundFileBrowser
{
public:
SoundFileOmega (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, int selected_tracks,
SoundFileOmega (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, int selected_tracks, bool persistent,
Editing::ImportMode mode_hint = Editing::ImportAsTrack);
void reset (int selected_tracks);

2
svn_revision.h
View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "2234";
static const char* ardour_svn_revision = "2494";
#endif