projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use new GtkUI design in ARDOUR_UI
[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 eb700624c3f8dcb1c4cd083360a02f8fb4b91667..fbfc8c7afd844bd263d7350a320c517c75915a64 100644
(file)
--- a/
gtk2_ardour/ardour_ui_dependents.cc
+++ b/
gtk2_ardour/ardour_ui_dependents.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,85
+15,81
@@
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$
*/
*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
/* this file exists solely to break compilation dependencies that
would connect changes to the mixer or editor objects.
*/
#include <cstdio>
/* this file exists solely to break compilation dependencies that
would connect changes to the mixer or editor objects.
*/
#include <cstdio>
-#include <gtkmm/accelmap.h>
+#include "pbd/error.h"
+
+#include "ardour/session.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"
#include "i18n.h"
-using namespace sigc;
using namespace Gtk;
using namespace Gtk;
+using namespace PBD;
namespace ARDOUR {
class Session;
class Route;
}
namespace ARDOUR {
class Session;
class Route;
}
-void
-ARDOUR_UI::shutdown ()
-{
- if (session) {
- delete session;
- session = 0;
- }
-
-}
+using namespace ARDOUR;
void
ARDOUR_UI::we_have_dependents ()
void
ARDOUR_UI::we_have_dependents ()
-{
- setup_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
{
install_actions ();
{
install_actions ();
- RedirectBox::register_actions ();
+ ProcessorBox::register_actions ();
+ keyboard->setup_keybindings ();
+ editor->setup_tooltips ();
+ editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
- try {
- AccelMap::load (ARDOUR::find_config_file ("ardour.bindings"));
- } catch (...) {
- error << "ardour key bindings file not found" << endmsg;
- }
+ editor->track_mixer_selection ();
+ mixer->track_editor_selection ();
}
void
ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
{
}
void
ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
{
- editor->connect_to_session (s);
- mixer->connect_to_session (s);
-}
+ BootMessage (_("Setup Editor"));
+ editor->set_session (s);
+ BootMessage (_("Setup Mixer"));
+ mixer->set_session (s);
+ meterbridge->set_session (s);
-void
-ARDOUR_UI::goto_editor_window ()
-{
- editor->show_window ();
- editor->present();
-}
-void
-ARDOUR_UI::goto_mixer_window ()
-{
- mixer->show_window ();
- mixer->present();
+ /* its safe to do this now */
+
+ BootMessage (_("Reload Session History"));
+ s->restore_history ("");
}
}
+/** The main editor window has been closed */
gint
gint
-ARDOUR_UI::exit_on_main_window_close (GdkEventAny *
ev
)
+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
}
}
+