From e1581242ca8554660ea68290688e573a9acfca06 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 13 Nov 2012 20:29:28 +0000
Subject: implement TC offset for slave&generator.

Many related changes that require atomic update, mostly
because ClockOption slots changed:

  * change offset config format to std:string (backwards compat - reads 0)
  * make Timecode offset independent from fps
  * sample_to_timecode() handle negative sample-num
  * audio-clock fix entry and edit of negative numbers
  * option editor:
    - remove old global internal offset
    - add slave & generator TC entry
    - still needs UI cleanup, tooltops, maybe sep. tab..
  * LTC & MTC slave& generator:
    - cache offset
    - subscribe to parameter changes

git-svn-id: svn://localhost/ardour2/branches/3.0@13485 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/option_editor.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gtk2_ardour/option_editor.h')

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 454b0f2245..5fbed4ea32 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -535,7 +535,7 @@ private:
 class ClockOption : public Option
 {
 public:
-	ClockOption (std::string const &, std::string const &, sigc::slot<ARDOUR::framecnt_t>, sigc::slot<bool, ARDOUR::framecnt_t>);
+	ClockOption (std::string const &, std::string const &, sigc::slot<std::string>, sigc::slot<bool, std::string>);
 	void set_state_from_config ();
 	void add_to_page (OptionEditorPage *);
 	void set_session (ARDOUR::Session *);
@@ -547,8 +547,9 @@ private:
 	void save_clock_time ();
 	Gtk::Label _label;
 	AudioClock _clock;
-	sigc::slot<ARDOUR::framecnt_t> _get;
-	sigc::slot<bool, ARDOUR::framecnt_t> _set;
+	sigc::slot<std::string> _get;
+	sigc::slot<bool, std::string> _set;
+	ARDOUR::Session *_session;
 };
 
 class DirectoryOption : public Option
-- 
cgit v1.2.3