projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another replacement of ActionManager::get_action() by ActionMap::find_action()
[ardour.git]
/
gtk2_ardour
/
big_clock_window.cc
diff --git
a/gtk2_ardour/big_clock_window.cc
b/gtk2_ardour/big_clock_window.cc
index c64393546c0f15c43c49023aa0c3f38b288f748d..58c63989d8f81eb6776dcf38d96e5a2d2c41cefc 100644
(file)
--- a/
gtk2_ardour/big_clock_window.cc
+++ b/
gtk2_ardour/big_clock_window.cc
@@
-21,23
+21,25
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
+#include "gtkmm2ext/utils.h"
+
#include "ardour_ui.h"
#include "audio_clock.h"
#include "big_clock_window.h"
#include "public_editor.h"
#include "utils.h"
#include "ardour_ui.h"
#include "audio_clock.h"
#include "big_clock_window.h"
#include "public_editor.h"
#include "utils.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using std::min;
using std::string;
using namespace ARDOUR_UI_UTILS;
using std::min;
using std::string;
using namespace ARDOUR_UI_UTILS;
-BigClockWindow::BigClockWindow (AudioClock& c)
+BigClockWindow::BigClockWindow (AudioClock& c)
: ArdourWindow (_("Big Clock"))
, clock (c)
{
: ArdourWindow (_("Big Clock"))
, clock (c)
{
- ARDOUR_UI::Clock.connect (sigc::
mem_fun (clock, &AudioClock::set
));
+ ARDOUR_UI::Clock.connect (sigc::
bind (sigc::mem_fun (clock, &AudioClock::set), false, 0
));
clock.set_corner_radius (0.0);
clock.set_corner_radius (0.0);
@@
-55,8
+57,7
@@
void
BigClockWindow::on_unmap ()
{
ArdourWindow::on_unmap ();
BigClockWindow::on_unmap ()
{
ArdourWindow::on_unmap ();
-
- PublicEditor::instance().reset_focus ();
+ ARDOUR_UI::instance()->reset_focus (this);
}
bool
}
bool