Rename libmusictime libtimecode (consistent with already used namespace "Timecode").

Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 43 insertions, 44 deletions

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 51864cf6dc..44dc3445c7 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -16,7 +16,7 @@ fi
 
 export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
 
-export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/musictime:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 797d8551e1..f0ae7c76f4 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -640,7 +640,7 @@ void
 AudioClock::set_bbt (framepos_t when, bool force)
 {
 	char buf[16];
-	BBT_Time bbt;
+	Timecode::BBT_Time bbt;
 
 	/* handle a common case */
 	if (is_duration) {
@@ -1342,7 +1342,7 @@ framepos_t
 AudioClock::get_frames (Field field, framepos_t pos, int dir)
 {
 	framecnt_t frames = 0;
-	BBT_Time bbt;
+	Timecode::BBT_Time bbt;
 	switch (field) {
 	case Timecode_Hours:
 		frames = (framecnt_t) floor (3600.0 * _session->frame_rate());
@@ -1930,7 +1930,7 @@ AudioClock::bbt_frame_duration_from_display (framepos_t pos) const
 		return 0;
 	}
 
-	BBT_Time bbt;
+	Timecode::BBT_Time bbt;
 
 
 	bbt.bars = atoi (bars_label.get_text());
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 84cd70ee67..cfa8770ba3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1101,7 +1101,7 @@ Editor::set_session (Session *t)
 	_session->history().Changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::history_changed, this), gui_context());
 
 	if (Profile->get_sae()) {
-		BBT_Time bbt;
+		Timecode::BBT_Time bbt;
 		bbt.bars = 0;
 		bbt.beats = 0;
 		bbt.ticks = 120;
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index ea71390ce6..def073d7b0 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1824,7 +1824,7 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 
 	motion (event, false);
 
-	BBT_Time when;
+	Timecode::BBT_Time when;
 
 	TempoMap& map (_editor->session()->tempo_map());
 	map.bbt_time (last_pointer_frame(), when);
@@ -1913,7 +1913,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 
 	motion (event, false);
 
-	BBT_Time when;
+	Timecode::BBT_Time when;
 
 	TempoMap& map (_editor->session()->tempo_map());
 	map.bbt_time (last_pointer_frame(), when);
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index a689553e67..a857ca4cec 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2150,7 +2150,7 @@ Editor::show_verbose_time_cursor (framepos_t frame, double offset, double xpos,
 {
 	char buf[128];
 	Timecode::Time timecode;
-	BBT_Time bbt;
+	Timecode::BBT_Time bbt;
 	int hours, mins;
 	framepos_t frame_rate;
 	float secs;
@@ -2207,8 +2207,8 @@ Editor::show_verbose_duration_cursor (framepos_t start, framepos_t end, double o
 {
 	char buf[128];
 	Timecode::Time timecode;
-	BBT_Time sbbt;
-	BBT_Time ebbt;
+	Timecode::BBT_Time sbbt;
+	Timecode::BBT_Time ebbt;
 	int hours, mins;
 	framepos_t distance, frame_rate;
 	float secs;
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 30fce08a93..4647104753 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -783,7 +783,7 @@ EditorRegions::update_all_subrows (TreeModel::Row const &parent_row, int level)
 void
 EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize)
 {
-	BBT_Time bbt;
+	Timecode::BBT_Time bbt;
 	Timecode::Time timecode;
 
 	switch (ARDOUR_UI::instance()->secondary_clock.mode ()) {
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index b367a55f25..db9058e57d 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -1144,20 +1144,20 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble
 void
 Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
 {
-        if (_session == 0) {
-                return;
-        }
+	if (_session == 0) {
+		return;
+	}
 	TempoMap::BBTPointList::iterator i;
-        BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
+	Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
 
-        _session->bbt_time (lower, lower_beat);
-        _session->bbt_time (upper, upper_beat);
-        uint32_t beats = 0;
+	_session->bbt_time (lower, lower_beat);
+	_session->bbt_time (upper, upper_beat);
+	uint32_t beats = 0;
 
 	bbt_accent_modulo = 1;
 	bbt_bar_helper_on = false;
-        bbt_bars = 0;
-        bbt_nmarks = 1;
+	bbt_bars = 0;
+	bbt_nmarks = 1;
 
 	bbt_ruler_scale =  bbt_over;
 
@@ -1268,18 +1268,18 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
 gint
 Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
 {
-        if (_session == 0) {
-                return 0;
-        }
+	if (_session == 0) {
+		return 0;
+	}
 
 	TempoMap::BBTPointList::iterator i;
 
-        char buf[64];
-        gint  n = 0;
+	char buf[64];
+	gint  n = 0;
 	framepos_t pos;
-	BBT_Time next_beat;
+	Timecode::BBT_Time next_beat;
 	framepos_t next_beat_pos;
-        uint32_t beats = 0;
+	uint32_t beats = 0;
 
 	uint32_t tick = 0;
 	uint32_t skip;
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 90fd6136cf..2bbcdf0472 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -144,7 +144,7 @@ Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
 		return;
 	}
 
-	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+	Timecode::BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
 	_session->bbt_time(leftmost, previous_beat);
 	_session->bbt_time(rightmost, next_beat);
@@ -224,7 +224,7 @@ Editor::mouse_add_new_tempo_event (framepos_t frame)
 	}
 
 	double bpm = 0;
-	BBT_Time requested;
+	Timecode::BBT_Time requested;
 
 	bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type();
@@ -271,7 +271,7 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
 	bpb = max (1.0, bpb); // XXX is this a reasonable limit?
 
 	double note_type = meter_dialog.get_note_type ();
-	BBT_Time requested;
+	Timecode::BBT_Time requested;
 
 	meter_dialog.get_bbt_time (requested);
 
@@ -352,7 +352,7 @@ Editor::edit_tempo_section (TempoSection* section)
 
 	double bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type ();
-	BBT_Time when;
+	Timecode::BBT_Time when;
 	tempo_dialog.get_bbt_time(when);
 	bpm = max (0.01, bpm);
 
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 32b252c97f..b5ba0fa972 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -246,7 +246,7 @@ ExportTimespanSelector::bbt_str (framepos_t frames) const
 	}
 
 	std::ostringstream oss;
-	BBT_Time time;
+	Timecode::BBT_Time time;
 	_session->bbt_time (frames, time);
 
 	print_padded (oss, time);
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 6a26a58fe3..da04c3dc94 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -200,7 +200,7 @@ MidiListEditor::redisplay_model ()
 			row[columns.note] = (*i)->note();
 			row[columns.velocity] = (*i)->velocity();
 			
-			BBT_Time bbt;
+			Timecode::BBT_Time bbt;
 			double dur;
 
 			_session->tempo_map().bbt_time (conv.to ((*i)->time()), bbt);
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 1190251fa1..cca9e6f7c5 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -42,7 +42,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action
 	  when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER),
 	  when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER)
 {
-	BBT_Time when;
+	Timecode::BBT_Time when;
 	Tempo tempo (map.tempo_at (frame));
 	map.bbt_time (frame, when);
 
@@ -62,7 +62,7 @@ TempoDialog::TempoDialog (TempoSection& section, const string & action)
 }
 
 void
-TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool movable)
+TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bool movable)
 {
 	bpm_spinner.set_numeric (true);
 	bpm_spinner.set_digits (2);
@@ -189,7 +189,7 @@ TempoDialog::get_bpm ()
 }
 
 bool
-TempoDialog::get_bbt_time (BBT_Time& requested)
+TempoDialog::get_bbt_time (Timecode::BBT_Time& requested)
 {
 	if (sscanf (when_bar_entry.get_text().c_str(), "%" PRIu32, &requested.bars) != 1) {
 		return false;
@@ -244,7 +244,7 @@ MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action
 	  ok_button (action),
 	  cancel_button (_("Cancel"))
 {
-	BBT_Time when;
+	Timecode::BBT_Time when;
 	frame = map.round_to_bar(frame,0);
 	Meter meter (map.meter_at(frame));
 
@@ -261,7 +261,7 @@ MeterDialog::MeterDialog (MeterSection& section, const string & action)
 }
 
 void
-MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool movable)
+MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double note_type, bool movable)
 {
 	snprintf (buf, sizeof (buf), "%.2f", bpb);
 	bpb_entry.set_text (buf);
@@ -447,9 +447,8 @@ MeterDialog::get_note_type ()
 }
 
 bool
-MeterDialog::get_bbt_time (BBT_Time& requested)
+MeterDialog::get_bbt_time (Timecode::BBT_Time& requested)
 {
-
 	if (sscanf (when_bar_entry.get_text().c_str(), "%" PRIu32, &requested.bars) != 1) {
 		return false;
 	}
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index ebb700e3e9..7e2f83de7c 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -43,10 +43,10 @@ public:
 
 	double get_bpm ();
 	double get_note_type ();
-	bool   get_bbt_time (ARDOUR::BBT_Time&);
+	bool   get_bbt_time (Timecode::BBT_Time&);
 
 private:
-	void init (const ARDOUR::BBT_Time& start, double, double, bool);
+	void init (const Timecode::BBT_Time& start, double, double, bool);
 	void bpm_changed ();
 	bool bpm_button_press (GdkEventButton* );
 	bool bpm_button_release (GdkEventButton* );
@@ -75,10 +75,10 @@ public:
 
 	double get_bpb ();
 	double get_note_type ();
-	bool   get_bbt_time (ARDOUR::BBT_Time&);
+	bool   get_bbt_time (Timecode::BBT_Time&);
 
 private:
-	void init (const ARDOUR::BBT_Time&, double, double, bool);
+	void init (const Timecode::BBT_Time&, double, double, bool);
 	bool entry_key_press (GdkEventKey* );
 	bool entry_key_release (GdkEventKey* );
 	void note_types_change ();