Credit Andrew added returns + vulkan patch

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mainclock.C

diff --git a/cinelerra-5.1/cinelerra/mainclock.C b/cinelerra-5.1/cinelerra/mainclock.C
index ddee51a23634249d8a28b7f1328f4a6a8230934b..f623eae9699185dd30257dbc6c798845f0b796b0 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainclock.C
+++ b/cinelerra-5.1/cinelerra/mainclock.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2017 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * 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
@@ -33,6 +34,8 @@ MainClock::MainClock(MWindow *mwindow, int x, int y, int w)
        this->mwindow = mwindow;
        position_offset = 0;
        set_bg_color(mwindow->theme->clock_bg_color);
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Time Format section");
 }
 
 MainClock::~MainClock()
@@ -49,11 +52,15 @@ void MainClock::update(double position)
        lock_window("MainClock::update");
        char string[BCTEXTLEN];
        position += position_offset;
+       double timecode_offset =
+               mwindow->edl->session->time_format == TIME_TIMECODE ?
+                       mwindow->get_timecode_offset() : 0 ;
        Units::totext(string, position,
                mwindow->edl->session->time_format,
                mwindow->edl->session->sample_rate,
                mwindow->edl->session->frame_rate,
-               mwindow->edl->session->frames_per_foot);
+               mwindow->edl->session->frames_per_foot,
+               timecode_offset);
        BC_Title::update(string);
        unlock_window();
 }