projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the "final" (??) fixes for transport state stuff before 2.8.4. y'all let me know...
[ardour.git]
/
gtk2_ardour
/
ardour_ui_dependents.cc
diff --git
a/gtk2_ardour/ardour_ui_dependents.cc
b/gtk2_ardour/ardour_ui_dependents.cc
index 8240073da9eff71dca7990acff856a8c7d981fc1..36d2154c46050c2e2c76c58305418b83d0639a8d 100644
(file)
--- a/
gtk2_ardour/ardour_ui_dependents.cc
+++ b/
gtk2_ardour/ardour_ui_dependents.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
/* this file exists solely to break compilation dependencies that
*/
/* this file exists solely to break compilation dependencies that
@@
-24,77
+23,115
@@
#include <cstdio>
#include <cstdio>
-#include <gtkmm/accelmap.h>
-
#include <pbd/error.h>
#include <pbd/error.h>
+
#include "ardour_ui.h"
#include "public_editor.h"
#include "mixer_ui.h"
#include "keyboard.h"
#include "ardour_ui.h"
#include "public_editor.h"
#include "mixer_ui.h"
#include "keyboard.h"
+#include "splash.h"
#include "route_params_ui.h"
#include "route_params_ui.h"
+#include "opts.h"
#include "i18n.h"
using namespace sigc;
using namespace Gtk;
#include "i18n.h"
using namespace sigc;
using namespace Gtk;
+using namespace PBD;
namespace ARDOUR {
class Session;
class Route;
}
namespace ARDOUR {
class Session;
class Route;
}
+using namespace ARDOUR;
+
void
ARDOUR_UI::shutdown ()
{
if (session) {
void
ARDOUR_UI::shutdown ()
{
if (session) {
- delete session;
+ /* we're exiting cleanly, so remove any auto-save data */
+ session->remove_pending_capture_state ();
session = 0;
}
session = 0;
}
+ ui_config->save_state();
}
void
ARDOUR_UI::we_have_dependents ()
}
void
ARDOUR_UI::we_have_dependents ()
-{
- setup_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
{
install_actions ();
{
install_actions ();
- editor->register_actions ();
RedirectBox::register_actions ();
RedirectBox::register_actions ();
- try {
- AccelMap::load (ARDOUR::find_config_file ("ardour.bindings"));
- } catch (...) {
- error << "ardour key bindings file not found" << endmsg;
- }
+ Keyboard::setup_keybindings ();
+
+ editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
}
void
ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
{
}
void
ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
{
+ BootMessage (_("Setup Editor"));
editor->connect_to_session (s);
editor->connect_to_session (s);
+ BootMessage (_("Setup Mixer"));
mixer->connect_to_session (s);
mixer->connect_to_session (s);
+
+ /* its safe to do this now */
+
+ BootMessage (_("Reload Session History"));
+ s->restore_history ("");
+}
+
+static bool
+_hide_splash (gpointer arg)
+{
+ ((ARDOUR_UI*)arg)->hide_splash();
+ return false;
}
void
ARDOUR_UI::goto_editor_window ()
{
}
void
ARDOUR_UI::goto_editor_window ()
{
+ if (splash && splash->is_visible()) {
+ // in 2 seconds, hide the splash screen
+ Glib::signal_timeout().connect (bind (sigc::ptr_fun (_hide_splash), this), 2000);
+ }
+
editor->show_window ();
editor->present();
editor->show_window ();
editor->present();
+ _mixer_on_top = false;
+ flush_pending ();
}
}
+
void
ARDOUR_UI::goto_mixer_window ()
{
mixer->show_window ();
mixer->present();
void
ARDOUR_UI::goto_mixer_window ()
{
mixer->show_window ();
mixer->present();
+ _mixer_on_top = true;
+ flush_pending ();
+}
+
+void
+ARDOUR_UI::toggle_editor_mixer_on_top ()
+{
+ if (_mixer_on_top) {
+ goto_editor_window ();
+ } else {
+ goto_mixer_window ();
+ }
}
gint
ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
{
}
gint
ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
{
+#ifdef TOP_MENUBAR
+ /* just hide the window, and return - the top menu stays up */
+ editor->hide ();
+ return TRUE;
+#else
+ /* time to get out of here */
finish();
return TRUE;
finish();
return TRUE;
+#endif
}
}