From 069cba8db1e71d56c84b8daafd225dcd00b4fe70 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 15 Nov 2008 12:28:42 +0000 Subject: OS X dbl-click open document debugging git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4181 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 19 ++++++++++++++++++- gtk2_ardour/cocoacarbon.mm | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bc6e496608..fd1f3191a9 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -637,6 +637,8 @@ void ARDOUR_UI::startup () { string name, path; + + cerr << "\n\n\nNEW SESSION DIALOG\n\n\n"; new_session_dialog = new NewSessionDialog(); @@ -2177,11 +2179,16 @@ ARDOUR_UI::idle_load (const Glib::ustring& path) load_session (Glib::path_get_dirname (path), basename_nosuffix (path)); } } else { + ARDOUR_COMMAND_LINE::session_name = path; + if (new_session_dialog) { + + /* make it break out of Dialog::run() and start again. */ + new_session_dialog->response (1); } } @@ -2199,10 +2206,18 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be begin: response = Gtk::RESPONSE_NONE; + cerr << "\n\n\n CONSIDER CLSN = " << ARDOUR_COMMAND_LINE::session_name << "\n\n\n"; + if (!ARDOUR_COMMAND_LINE::session_name.empty()) { parse_cmdline_path (ARDOUR_COMMAND_LINE::session_name, session_name, session_path, existing_session); + cerr << "from command line got name = " + << session_name + << " path = " << session_path + << " existing ? " << existing_session + << endl; + /* don't ever reuse this */ ARDOUR_COMMAND_LINE::session_name = string(); @@ -2305,7 +2320,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be if (session_name[0] == '/' || (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') || (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) { - + session_path = Glib::path_get_dirname (session_name); session_name = Glib::path_get_basename (session_name); @@ -2363,6 +2378,8 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be loadit: new_session_dialog->hide (); + + cerr << "trying to load " << session_path << " as " << session_name << endl; if (load_session (session_path, session_name, template_name)) { /* force a retry */ diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index 75df481186..3c89c0590d 100644 --- a/gtk2_ardour/cocoacarbon.mm +++ b/gtk2_ardour/cocoacarbon.mm @@ -61,6 +61,8 @@ handle_open_documents (const AppleEvent *inAppleEvent, { AEDescList docs; + cerr << "\n\n\n\n HANDLE DOCUMENT\n\n\n"; + if (AEGetParamDesc(inAppleEvent, keyDirectObject, typeAEList, &docs) == noErr) { long n = 0; AECountItems(&docs, &n); -- cgit v1.2.3