X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoombar.C;h=408473d6ec0167c6ca7d1a722ffbc245e5bc1fd3;hp=401898c7122645c675cbf1924b3f730f025d4193;hb=3ac8199743f244669cc87ceef9c3cd23710552f3;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 401898c7..408473d6 100644
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -67,25 +67,16 @@ void ZoomBar::create_objects()
 
 	draw_top_background(get_parent(), 0, 0, get_w(), get_h());
 	sample_zoom = new SampleZoomPanel(mwindow, this, x, y);
-	sample_zoom->set_menu_images(mwindow->theme->get_image_set("zoombar_menu", 0));
-	sample_zoom->set_tumbler_images(mwindow->theme->get_image_set("zoombar_tumbler", 0));
 	sample_zoom->create_objects();
-	sample_zoom->zoom_text->set_tooltip(_("Duration visible in the timeline"));
-	sample_zoom->zoom_tumbler->set_tooltip(_("Duration visible in the timeline"));
+	sample_zoom->set_tooltip(_("Duration visible in the timeline"));
 	x += sample_zoom->get_w();
 	amp_zoom = new AmpZoomPanel(mwindow, this, x, y);
-	amp_zoom->set_menu_images(mwindow->theme->get_image_set("zoombar_menu", 0));
-	amp_zoom->set_tumbler_images(mwindow->theme->get_image_set("zoombar_tumbler", 0));
 	amp_zoom->create_objects();
-	amp_zoom->zoom_text->set_tooltip(_("Audio waveform scale"));
-	amp_zoom->zoom_tumbler->set_tooltip(_("Audio waveform scale"));
+	amp_zoom->set_tooltip(_("Audio waveform scale"));
 	x += amp_zoom->get_w();
 	track_zoom = new TrackZoomPanel(mwindow, this, x, y);
-	track_zoom->set_menu_images(mwindow->theme->get_image_set("zoombar_menu", 0));
-	track_zoom->set_tumbler_images(mwindow->theme->get_image_set("zoombar_tumbler", 0));
 	track_zoom->create_objects();
-	track_zoom->zoom_text->set_tooltip(_("Height of tracks in the timeline"));
-	track_zoom->zoom_tumbler->set_tooltip(_("Height of tracks in the timeline"));
+	track_zoom->set_tooltip(_("Height of tracks in the timeline"));
 	x += track_zoom->get_w() + 10;
 
 	int wid = 120;
@@ -136,23 +127,9 @@ void ZoomBar::update_formatting(BC_TextBox *dst)
 
 void ZoomBar::resize_event()
 {
-	reposition_window(mwindow->theme->mzoom_x,
-		mwindow->theme->mzoom_y,
-		mwindow->theme->mzoom_w,
-		mwindow->theme->mzoom_h);
-
+	reposition_window(mwindow->theme->mzoom_x, mwindow->theme->mzoom_y,
+		mwindow->theme->mzoom_w, mwindow->theme->mzoom_h);
 	draw_top_background(get_parent(), 0, 0, get_w(), get_h());
- 	int x = 3, y = 1;
-	if (sample_zoom) delete sample_zoom;
-	sample_zoom = new SampleZoomPanel(mwindow, this, x, y);
-	sample_zoom->set_menu_images(mwindow->theme->get_image_set("zoombar_menu", 0));
-	sample_zoom->set_tumbler_images(mwindow->theme->get_image_set("zoombar_tumbler", 0));
-	sample_zoom->create_objects();
-// 	x += sample_zoom->get_w();
-// 	amp_zoom->reposition_window(x, y);
-// 	x += amp_zoom->get_w();
-// 	track_zoom->reposition_window(x, y);
-	flash();
 }
 
 void ZoomBar::redraw_time_dependancies()
@@ -225,8 +202,7 @@ int ZoomBar::update_playback(int64_t new_position)
 {
 	if(new_position != old_position)
 	{
-		Units::totext(string,
-				new_position,
+		Units::totext(string, new_position,
 				mwindow->edl->session->sample_rate,
 				mwindow->edl->session->time_format,
 				mwindow->edl->session->frame_rate,
@@ -350,19 +326,9 @@ int ZoomBar::set_selection(int which_one)
 
 
 
-SampleZoomPanel::SampleZoomPanel(MWindow *mwindow,
-	ZoomBar *zoombar,
-	int x,
-	int y)
- : ZoomPanel(mwindow,
- 	zoombar,
-	mwindow->edl->local_session->zoom_sample,
-	x,
-	y,
-	110,
-	MIN_ZOOM_TIME,
-	MAX_ZOOM_TIME,
-	ZOOM_TIME)
+SampleZoomPanel::SampleZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
+ : ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_sample,
+		x, y, 110, MIN_ZOOM_TIME, MAX_ZOOM_TIME, ZOOM_TIME)
 {
 	this->mwindow = mwindow;
 	this->zoombar = zoombar;
@@ -375,15 +341,8 @@ int SampleZoomPanel::handle_event()
 
 
 AmpZoomPanel::AmpZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
- : ZoomPanel(mwindow,
- 	zoombar,
-	mwindow->edl->local_session->zoom_y,
-	x,
-	y,
-	80,
-	MIN_AMP_ZOOM,
-	MAX_AMP_ZOOM,
-	ZOOM_LONG)
+ : ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_y,
+		x, y, 80, MIN_AMP_ZOOM, MAX_AMP_ZOOM, ZOOM_LONG)
 {
 	this->mwindow = mwindow;
 	this->zoombar = zoombar;
@@ -395,15 +354,8 @@ int AmpZoomPanel::handle_event()
 }
 
 TrackZoomPanel::TrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
- : ZoomPanel(mwindow,
- 	zoombar,
-	mwindow->edl->local_session->zoom_track,
-	x,
-	y,
-	70,
-	MIN_TRACK_ZOOM,
-	MAX_TRACK_ZOOM,
-	ZOOM_LONG)
+ : ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_track,
+		x, y, 70, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM, ZOOM_LONG)
 {
 	this->mwindow = mwindow;
 	this->zoombar = zoombar;
@@ -419,9 +371,7 @@ int TrackZoomPanel::handle_event()
 
 
 AutoZoom::AutoZoom(MWindow *mwindow, ZoomBar *zoombar, int x, int y, int changemax)
- : BC_Tumbler(x,
- 	y,
- 	mwindow->theme->get_image_set("zoombar_tumbler"))
+ : BC_Tumbler(x, y, mwindow->theme->get_image_set("zoombar_tumbler"))
 {
 	this->mwindow = mwindow;
 	this->zoombar = zoombar;
@@ -586,8 +536,6 @@ int FromTextBox::handle_event()
 
 int FromTextBox::update_position(double new_position)
 {
-	new_position += mwindow->edl->session->get_frame_offset() /
-						 mwindow->edl->session->frame_rate;;
 	Units::totext(string,
 		new_position,
 		mwindow->edl->session->time_format,
@@ -658,10 +606,7 @@ int ToTextBox::handle_event()
 
 int ToTextBox::update_position(double new_position)
 {
-	new_position += mwindow->edl->session->get_frame_offset() /
-						 mwindow->edl->session->frame_rate;
-	Units::totext(string,
-		new_position,
+	Units::totext(string, new_position,
 		mwindow->edl->session->time_format,
 		mwindow->edl->session->sample_rate,
 		mwindow->edl->session->frame_rate,