#include "canvas/scroll_group.h"
#include "canvas/tracking_text.h"
-#include "ardour_ui.h"
#include "audio_clock.h"
#include "editor.h"
#include "editor_drag.h"
-#include "global_signals.h"
#include "main_clock.h"
#include "verbose_cursor.h"
+#include "ardour_ui.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
{
_canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group());
CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor");
- _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_LargerBoldFont()));
+ _canvas_item->set_font_description (Pango::FontDescription (UIConfiguration::instance().get_LargerBoldFont()));
color_handler ();
- ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
}
void
VerboseCursor::color_handler ()
{
- _canvas_item->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
+ _canvas_item->set_color (UIConfiguration::instance().color_mod ("verbose canvas cursor", "verbose canvas cursor"));
}
ArdourCanvas::Item *
}
void
-VerboseCursor::set_time (framepos_t frame)
+VerboseCursor::set_time (samplepos_t sample)
{
char buf[128];
Timecode::Time timecode;
switch (m) {
case AudioClock::BBT:
- _editor->_session->bbt_time (frame, bbt);
+ _editor->_session->bbt_time (sample, bbt);
snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks);
break;
case AudioClock::Timecode:
- _editor->_session->timecode_time (frame, timecode);
+ _editor->_session->timecode_time (sample, timecode);
snprintf (buf, sizeof (buf), "%s", Timecode::timecode_format_time (timecode).c_str());
break;
case AudioClock::MinSec:
- AudioClock::print_minsec (frame, buf, sizeof (buf), _editor->_session->frame_rate());
+ AudioClock::print_minsec (sample, buf, sizeof (buf), _editor->_session->sample_rate());
+ break;
+
+ case AudioClock::Seconds:
+ snprintf (buf, sizeof(buf), "%.1f", sample / (float)_editor->_session->sample_rate());
break;
default:
- snprintf (buf, sizeof(buf), "%" PRIi64, frame);
+ snprintf (buf, sizeof(buf), "%" PRIi64, sample);
break;
}
}
void
-VerboseCursor::set_duration (framepos_t start, framepos_t end)
+VerboseCursor::set_duration (samplepos_t start, samplepos_t end)
{
char buf[128];
Timecode::Time timecode;
Timecode::BBT_Time sbbt;
Timecode::BBT_Time ebbt;
- Meter meter_at_start (_editor->_session->tempo_map().meter_at(start));
+ Meter meter_at_start (_editor->_session->tempo_map().meter_at_sample (start));
if (_editor->_session == 0) {
return;
break;
case AudioClock::MinSec:
- AudioClock::print_minsec (end - start, buf, sizeof (buf), _editor->_session->frame_rate());
+ AudioClock::print_minsec (end - start, buf, sizeof (buf), _editor->_session->sample_rate());
+ break;
+
+ case AudioClock::Seconds:
+ snprintf (buf, sizeof(buf), "%.1f", (end - start) / (float)_editor->_session->sample_rate());
break;
default: