X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainindexes.C;h=05812bb7c02b47ca1414e455e071e5c16eabfe5b;hp=679441bd896d00a1d3c479bebdd6999ffdb5fc40;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/cinelerra/mainindexes.C b/cinelerra-5.1/cinelerra/mainindexes.C
index 679441bd..05812bb7 100644
--- a/cinelerra-5.1/cinelerra/mainindexes.C
+++ b/cinelerra-5.1/cinelerra/mainindexes.C
@@ -74,8 +74,7 @@ void MainIndexes::add_next_asset(File *file, Indexable *indexable)
 SET_TRACE
 // Test current asset
 	IndexFile indexfile(mwindow, indexable);
-	IndexState *index_state = 0;
-	index_state = indexable->index_state;
+	IndexState *index_state = indexable->index_state;
 
 SET_TRACE
 	int ret = indexfile.open_index();
@@ -92,13 +91,6 @@ SET_TRACE
 	next_lock->unlock();
 }
 
-void MainIndexes::delete_current_sources()
-{
-	for(int i = 0; i < current_indexables.size(); i++)
-		current_indexables.get(i)->Garbage::remove_user();
-	current_indexables.remove_all();
-}
-
 void MainIndexes::start_loop()
 {
 	interrupt_flag = 0;
@@ -141,8 +133,6 @@ void MainIndexes::interrupt_build()
 
 void MainIndexes::load_next_sources()
 {
-	delete_current_sources();
-
 // Transfer from new list
 	next_lock->lock("MainIndexes::load_next_sources");
 	for(int i = 0; i < next_indexables.size(); i++)
@@ -167,13 +157,14 @@ void MainIndexes::run()
 
 // test index of each indexable
 		MainProgressBar *progress = 0;
-		int total_sources = current_indexables.size();
 
-		for( int i = 0; i < total_sources && !interrupt_flag; ++i ) {
+		next_lock->lock("MainIndexes::run");
+		for( int i=0; i<current_indexables.size() && !interrupt_flag; ++i ) {
 			Indexable *indexable = current_indexables[i];
 			IndexState *index_state = indexable->index_state;
 // if status is known, no probe
 			if( index_state->index_status != INDEX_NOTTESTED ) continue;
+			next_lock->unlock();
 
 			IndexFile indexfile(mwindow, indexable);
 			int ret = indexfile.open_index();
@@ -196,8 +187,14 @@ void MainIndexes::run()
 			indexfile.create_index(progress);
 			if( progress->is_cancelled() )
 				interrupt_flag = 1;
+			next_lock->lock("MainIndexes::run");
 		}
 
+		for( int i=0; i<current_indexables.size(); ++i )
+			current_indexables[i]->remove_user();
+		current_indexables.remove_all();
+		next_lock->unlock();
+
 		if(progress) {	// progress box is only created when an index is built
 			if(mwindow->gui) mwindow->gui->lock_window("MainIndexes::run 3");
 			progress->stop_progress();