X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=7d0c140f17a90e1e986283c49f7822ac3041fd19;hb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;hp=702bd8a7c6fde6bb0aaa68bbe0354f74b607efd2;hpb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 702bd8a7..7d0c140f 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -349,8 +349,9 @@ MWindow::~MWindow()
 	delete gui;		gui = 0;
 	delete mainindexes;     mainindexes = 0;
 	delete mainprogress;    mainprogress = 0;
-	delete audio_cache;     audio_cache = 0;  // delete the cache after the assets
-	delete video_cache;     video_cache = 0;  // delete the cache after the assets
+ // delete the caches after the assets
+	if( audio_cache ) { audio_cache->remove_user();  audio_cache = 0; }
+	if( video_cache ) { video_cache->remove_user();  video_cache = 0; }
 	delete frame_cache;     frame_cache = 0;
 	delete wave_cache;      wave_cache = 0;
 	delete plugin_guis;     plugin_guis = 0;
@@ -3730,6 +3731,7 @@ void MWindow::update_project(int load_mode)
 
 	if( load_mode == LOADMODE_REPLACE ||
 	    load_mode == LOADMODE_REPLACE_CONCATENATE ) {
+		edl->session->timecode_offset = 0;
 		delete gui->keyvalue_popup;
 		gui->keyvalue_popup = 0;
 		gui->load_panes();
@@ -3951,6 +3953,7 @@ int MWindow::save(int save_as)
 	for( int i=stack.size(); --i>=0;  ) {
 		StackItem &item = stack[i];
 		Indexable *idxbl = item.idxbl;
+		if( !idxbl ) continue;
 		if( idxbl->is_asset ) {
 			Asset *asset = (Asset *)idxbl;
 			if( asset->format == FILE_REF ) {
@@ -3958,8 +3961,8 @@ int MWindow::save(int save_as)
 					return 1;
 			}
 		}
-		else if( item.new_edl != item.idxbl )
-			item.new_edl->overwrite_clip((EDL*)item.idxbl);
+		else if( item.new_edl != idxbl )
+			item.new_edl->overwrite_clip((EDL*)idxbl);
 	}
 	EDL *new_edl = stack.size() ? stack[0].edl : edl;
 	save(new_edl, path, 1);
@@ -4778,31 +4781,30 @@ int MWindow::interrupt_indexes()
 
 void MWindow::next_time_format()
 {
-	switch(edl->session->time_format)
-	{
-		case TIME_HMS: edl->session->time_format = TIME_HMSF; break;
-		case TIME_HMSF: edl->session->time_format = TIME_SAMPLES; break;
-		case TIME_SAMPLES: edl->session->time_format = TIME_SAMPLES_HEX; break;
-		case TIME_SAMPLES_HEX: edl->session->time_format = TIME_FRAMES; break;
-		case TIME_FRAMES: edl->session->time_format = TIME_FEET_FRAMES; break;
-		case TIME_FEET_FRAMES: edl->session->time_format = TIME_SECONDS; break;
-		case TIME_SECONDS: edl->session->time_format = TIME_HMS; break;
+	switch( edl->session->time_format ) {
+	case TIME_HMS:          edl->session->time_format = TIME_HMSF;         break;
+	case TIME_HMSF:         edl->session->time_format = TIME_TIMECODE;     break;
+	case TIME_TIMECODE:     edl->session->time_format = TIME_FRAMES;       break;
+	case TIME_FRAMES:       edl->session->time_format = TIME_SAMPLES;      break;
+	case TIME_SAMPLES:      edl->session->time_format = TIME_SAMPLES_HEX;  break;
+	case TIME_SAMPLES_HEX:  edl->session->time_format = TIME_SECONDS;      break;
+	case TIME_SECONDS:      edl->session->time_format = TIME_FEET_FRAMES;  break;
+	case TIME_FEET_FRAMES:  edl->session->time_format = TIME_HMS;          break;
 	}
-
 	time_format_common();
 }
 
 void MWindow::prev_time_format()
 {
-	switch(edl->session->time_format)
-	{
-		case TIME_HMS: edl->session->time_format = TIME_SECONDS; break;
-		case TIME_SECONDS: edl->session->time_format = TIME_FEET_FRAMES; break;
-		case TIME_FEET_FRAMES: edl->session->time_format = TIME_FRAMES; break;
-		case TIME_FRAMES: edl->session->time_format = TIME_SAMPLES_HEX; break;
-		case TIME_SAMPLES_HEX: edl->session->time_format = TIME_SAMPLES; break;
-		case TIME_SAMPLES: edl->session->time_format = TIME_HMSF; break;
-		case TIME_HMSF: edl->session->time_format = TIME_HMS; break;
+	switch( edl->session->time_format ) {
+	case TIME_HMS:          edl->session->time_format = TIME_FEET_FRAMES;  break;
+	case TIME_HMSF:         edl->session->time_format = TIME_HMS;          break;
+	case TIME_TIMECODE:     edl->session->time_format = TIME_HMSF;         break;
+	case TIME_FRAMES:       edl->session->time_format = TIME_TIMECODE;     break;
+	case TIME_SAMPLES:      edl->session->time_format = TIME_FRAMES;       break;
+	case TIME_SAMPLES_HEX:  edl->session->time_format = TIME_SAMPLES;      break;
+	case TIME_SECONDS:      edl->session->time_format = TIME_SAMPLES_HEX;  break;
+	case TIME_FEET_FRAMES:  edl->session->time_format = TIME_SECONDS;      break;
 	}
 
 	time_format_common();