improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...

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

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 79d862fb2c0237406b5098a60f29db105f95801a..5171469d3f1e0a6e9fc77917da01b583cb7b33a8 100644 (file)
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -77,11 +77,11 @@ void ZoomBar::create_objects()
        x += amp_zoom->get_w();
        atrack_zoom = new ATrackZoomPanel(mwindow, this, x, y);
        atrack_zoom->create_objects();
        x += amp_zoom->get_w();
        atrack_zoom = new ATrackZoomPanel(mwindow, this, x, y);
        atrack_zoom->create_objects();

-       atrack_zoom->set_tooltip(_("Height of audio tracks in the timeline"));
+       atrack_zoom->set_tooltip(_("Height of audio tracks"));

        x += atrack_zoom->get_w() + xs10;
        vtrack_zoom = new VTrackZoomPanel(mwindow, this, x, y);
        vtrack_zoom->create_objects();
        x += atrack_zoom->get_w() + xs10;
        vtrack_zoom = new VTrackZoomPanel(mwindow, this, x, y);
        vtrack_zoom->create_objects();

-       vtrack_zoom->set_tooltip(_("Height of video tracks in the timeline"));
+       vtrack_zoom->set_tooltip(_("Height of video tracks"));

        x += vtrack_zoom->get_w() + xs10;
 
        int wid = xS(120);
        x += vtrack_zoom->get_w() + xs10;
 
        int wid = xS(120);


@@ -388,6 +388,8 @@ AmpZoomPanel::AmpZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
 }
 int AmpZoomPanel::handle_event()
 {
 }
 int AmpZoomPanel::handle_event()
 {

+       if( zoombar->shift_down() )
+               update(DEFAULT_ZOOM_TRACK);

        mwindow->zoom_amp((int64_t)get_value());
        return 1;
 }
        mwindow->zoom_amp((int64_t)get_value());
        return 1;
 }


@@ -401,6 +403,8 @@ ATrackZoomPanel::ATrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
 }
 int ATrackZoomPanel::handle_event()
 {
 }
 int ATrackZoomPanel::handle_event()
 {

+       if( zoombar->shift_down() )
+               update(DEFAULT_ZOOM_TRACK);

        mwindow->zoom_atrack((int64_t)get_value());
        zoombar->amp_zoom->update(mwindow->edl->local_session->zoom_y);
        return 1;
        mwindow->zoom_atrack((int64_t)get_value());
        zoombar->amp_zoom->update(mwindow->edl->local_session->zoom_y);
        return 1;


@@ -415,6 +419,8 @@ VTrackZoomPanel::VTrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
 }
 int VTrackZoomPanel::handle_event()
 {
 }
 int VTrackZoomPanel::handle_event()
 {

+       if( zoombar->shift_down() )
+               update(DEFAULT_ZOOM_TRACK);

        mwindow->zoom_vtrack((int64_t)get_value());
        return 1;
 }
        mwindow->zoom_vtrack((int64_t)get_value());
        return 1;
 }