X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracking.C;h=4ba197e5cec27c5e9054a90639fc9431adab38e7;hp=1ca59993e9aa5a31ae383de3916b15200c041389;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=50a589b1decdd353a984d8a710e064ebaf8b4f7b

diff --git a/cinelerra-5.1/cinelerra/tracking.C b/cinelerra-5.1/cinelerra/tracking.C
index 1ca59993..4ba197e5 100644
--- a/cinelerra-5.1/cinelerra/tracking.C
+++ b/cinelerra-5.1/cinelerra/tracking.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2014 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "arender.h"
@@ -51,7 +51,7 @@
 Tracking::Tracking(MWindow *mwindow)
  : Thread(1, 0, 0)
 {
-	this->mwindow = mwindow; 
+	this->mwindow = mwindow;
 	state = DONE;
 	startup_lock = new Condition(0, "Tracking::startup_lock");
 }
@@ -64,9 +64,8 @@ Tracking::~Tracking()
 		state = DONE;
 // Not working in NPTL for some reason
 //		Thread::cancel();
-		Thread::join();
 	}
-
+	Thread::join();
 
 	delete startup_lock;
 }
@@ -99,12 +98,13 @@ int Tracking::stop_playback()
 //		Thread::cancel();
 		Thread::join();
 
+		mwindow->stop_mixers();
 // Final position is updated continuously during playback
 // Get final position
 		double position = get_tracking_position();
 // Update cursor
 		update_tracker(position);
-	
+
 		stop_meters();
 	}
 	return 0;
@@ -173,7 +173,7 @@ void Tracking::draw()
 // 	{
 // 		pixel = get_pixel(last_position);
 // 	}
-// 
+//
 // 	gui->canvas->set_color(GREEN);
 // 	gui->canvas->set_inverse();
 // 	gui->canvas->draw_line(pixel, 0, pixel, gui->canvas->get_h());