add haupauge-1657 dual usb capture support, add deinterlace to recordmonitor, asset...

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

diff --git a/cinelerra-5.1/cinelerra/mtimebar.C b/cinelerra-5.1/cinelerra/mtimebar.C
index 8889cc87b47391b048175cf9c329f7377c6e453d..7eec4d34d3ee01165347190cd924fe6cdc3d9429 100644 (file)
--- a/cinelerra-5.1/cinelerra/mtimebar.C
+++ b/cinelerra-5.1/cinelerra/mtimebar.C
@@ -101,10 +101,11 @@ void MTimeBar::stop_transport()
        gui->stop_transport("MTimeBar::stop_transport");
 }
 
-#define TEXT_MARGIN 4
-#define TICK_SPACING 5
-#define LINE_MARGIN 3
-#define TICK_MARGIN 16
+#define TEXT_MARGIN xS(4)
+#define TICK_SPACING xS(5)
+#define LINE_MARGIN yS(3)
+#define TICK_MARGIN yS(16)
+
 void MTimeBar::draw_time()
 {
 
@@ -399,7 +400,7 @@ void MTimeBar::draw_time()
                set_font(MEDIUMFONT);
 
                draw_text(pixel + TEXT_MARGIN, get_text_ascent(MEDIUMFONT), string);
-               draw_line(pixel, LINE_MARGIN, pixel, get_h() - 2);
+               draw_line(pixel, LINE_MARGIN, pixel, get_h() - yS(2));
 
                double position2 = start_position + text_interval * (iteration + 1);
                int pixel2 = (int64_t)(position2 / time_per_pixel) -
@@ -413,7 +414,7 @@ void MTimeBar::draw_time()
                                mwindow->edl->local_session->view_start[pane->number];
                        if(labs(pixel - pixel1) > 1 &&
                                labs(pixel - pixel2) > 1)
-                               draw_line(pixel, TICK_MARGIN, pixel, get_h() - 2);
+                               draw_line(pixel, TICK_MARGIN, pixel, get_h() - yS(2));
                }
                iteration++;
        }
@@ -657,10 +658,6 @@ void MTimeBar::activate_timeline()
 }
 
 
-
-
-
-
 TimeBarPopupItem::TimeBarPopupItem(MWindow *mwindow,
        TimeBarPopup *menu,
        const char *text,
@@ -683,11 +680,7 @@ int TimeBarPopupItem::handle_event()
 
 
 TimeBarPopup::TimeBarPopup(MWindow *mwindow)
- : BC_PopupMenu(0,
-               0,
-               0,
-               "",
-               0)
+ : BC_PopupMenu(0, 0, 0, "", 0)
 {
        this->mwindow = mwindow;
 }
@@ -700,47 +693,26 @@ TimeBarPopup::~TimeBarPopup()
 void TimeBarPopup::create_objects()
 {
        add_item(items[0] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_HMS_TEXT,
-               TIME_HMS));
+               this, TIME_HMS_TEXT, TIME_HMS));
        add_item(items[1] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_HMSF_TEXT,
-               TIME_HMSF));
+               this, TIME_HMSF_TEXT, TIME_HMSF));
        add_item(items[2] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_FRAMES_TEXT,
-               TIME_FRAMES));
+               this, TIME_FRAMES_TEXT, TIME_FRAMES));
        add_item(items[3] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_SAMPLES_TEXT,
-               TIME_SAMPLES));
+               this, TIME_SAMPLES_TEXT, TIME_SAMPLES));
        add_item(items[4] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_SAMPLES_HEX_TEXT,
-               TIME_SAMPLES_HEX));
+               this, TIME_SAMPLES_HEX_TEXT, TIME_SAMPLES_HEX));
        add_item(items[5] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_SECONDS_TEXT,
-               TIME_SECONDS));
+               this, TIME_SECONDS_TEXT, TIME_SECONDS));
        add_item(items[6] = new TimeBarPopupItem(mwindow,
-               this,
-               TIME_FEET_FRAMES_TEXT,
-               TIME_FEET_FRAMES));
+               this, TIME_FEET_FRAMES_TEXT, TIME_FEET_FRAMES));
 }
 
 void TimeBarPopup::update()
 {
-       for(int i = 0; i < TOTAL_TIMEFORMATS; i++)
-       {
-               if(items[i]->value == mwindow->edl->session->time_format)
-               {
-                       items[i]->set_checked(1);
-               }
-               else
-               {
-                       items[i]->set_checked(0);
-               }
+       int time_format = mwindow->edl->session->time_format;
+       for( int i=0; i<TOTAL_TIMEFORMATS; ++i ) {
+               items[i]->set_checked(items[i]->value == time_format);
        }
 }