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

make NSD open correctly if open clicked from audio setup page

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2315 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-08-16 14:54:06 +00:00
parent 43a43437bc
commit eb8fa64dff
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.cc
View file

@ -257,7 +257,6 @@ ARDOUR_UI::create_engine ()
engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name); engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name);
} catch (AudioEngine::NoBackendAvailable& err) { } catch (AudioEngine::NoBackendAvailable& err) {
backend_audio_error (); backend_audio_error ();
cerr << "engine not started\n";
error << string_compose (_("Could not connect to JACK server as \"%1\""), ARDOUR_COMMAND_LINE::jack_client_name) << endmsg; error << string_compose (_("Could not connect to JACK server as \"%1\""), ARDOUR_COMMAND_LINE::jack_client_name) << endmsg;
exit (1); exit (1);
} }
@ -1979,8 +1978,6 @@ ARDOUR_UI::new_session (Glib::ustring predetermined_path, bool have_engine)
have_engine = true; have_engine = true;
} }
cerr << "startingengine\n";
create_engine (); create_engine ();
/* now handle possible affirmative responses */ /* now handle possible affirmative responses */

5
gtk2_ardour/new_session_dialog.cc
View file

@ -491,7 +491,10 @@ NewSessionDialog::session_name() const
} }
*/ */
if (m_notebook->get_current_page() == 0) { int page = m_notebook->get_current_page();
if (page == 0 || page == 2) {
/* new or audio setup pages */
return Glib::filename_from_utf8(m_name->get_text()); return Glib::filename_from_utf8(m_name->get_text());
} else { } else {
if (m_treeview->get_selection()->count_selected_rows() == 0) { if (m_treeview->get_selection()->count_selected_rows() == 0) {