X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=2918e23e63e59e4035bb86e2b07059ea0536fd2e;hp=f8d4fc4e86f4b17223173db31238de226c942586;hb=686c4d754c80b9865c0a5a7315c5fa4d0d39f4a7;hpb=a718f58e6d8061f83bd0c0b10848ac415cd21fcd

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index f8d4fc4e..2918e23e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -296,6 +296,7 @@ MWindow::~MWindow()
 	plugin_gui_lock->unlock();
 	hide_keyframe_guis();
 	clean_indexes();
+	clean_backups();
 	save_defaults();
 // Give up and go to a movie
 //  cant run valgrind if this is used
@@ -984,6 +985,58 @@ void MWindow::init_preferences()
 	YUV::yuv.yuv_set_colors(preferences->yuv_color_space, preferences->yuv_color_range);
 }
 
+void MWindow::clean_backups()
+{
+    FileSystem fs;
+    int total_excess;
+    long oldest = 0;
+    int oldest_item = -1;
+    char string[BCTEXTLEN];
+
+// Delete extra backups
+    fs.set_filter("backup*.prev_*");
+    fs.complete_path(preferences->index_directory);
+    fs.update(preferences->index_directory);
+
+    // set to 50 for now
+    // total_excess = fs.dir_list.total - preferences->index_count;
+    total_excess = fs.dir_list.total - 50;
+    printf("Total excess of backups: %i \n", total_excess);
+
+//printf("MWindow::clean_backups 1 %d\n", fs.dir_list.total);
+
+    while(total_excess > 0)
+    {
+// Get oldest
+       for(int i = 0; i < fs.dir_list.total; i++)
+       {
+           fs.join_names(string, preferences->index_directory, fs.dir_list[i]->name);
+
+           if(i == 0 || fs.get_date(string) <= oldest)
+           {
+               oldest = fs.get_date(string);
+               oldest_item = i;
+           }
+       }
+
+       if(oldest_item >= 0)
+       {
+// Remove backup file
+           fs.join_names(string,
+               preferences->index_directory,
+               fs.dir_list[oldest_item]->name);
+//printf("MWindow::clean_backups 1 %s\n", string);
+           if(remove(string))
+               perror("delete_backups");
+           delete fs.dir_list[oldest_item];
+           fs.dir_list.remove_number(oldest_item);
+
+       }
+
+       total_excess--;
+    }
+}
+
 void MWindow::clean_indexes()
 {
 	FileSystem fs;
@@ -1469,6 +1522,27 @@ int MWindow::select_zwindow(ZWindow *zwindow)
 
 void MWindow::tile_mixers()
 {
+	int x1 = session->tile_mixers_x;
+	int y1 = session->tile_mixers_y;
+	int x2 = x1 + session->tile_mixers_w;
+	int y2 = y1 + session->tile_mixers_h;
+	tile_mixers(x1, y1, x2, y2);
+}
+
+void MWindow::tile_mixers(int x1, int y1, int x2, int y2)
+{
+	if( x1 == x2 || y1 == y2 ) {
+// use top left quadrent
+		int sw = gui->get_screen_w(1, -1);
+		int sh = gui->get_screen_w(1, -1);
+		x1 = 1;     y1 = 1;
+		x2 = sw/2;  y2 = sh/2;
+	}
+	else {
+		if( x1 > x2 ) { int t = x1;  x1 = x2;  x2 = t; }
+		if( y1 > y2 ) { int t = y1;  y1 = y2;  y2 = t; }
+	}
+	int ow = edl->session->output_w, oh = edl->session->output_h;
 	int nz = 0;
 	for( int i=0; i<zwindows.size(); ++i ) {
 		ZWindow *zwindow = zwindows[i];
@@ -1476,34 +1550,63 @@ void MWindow::tile_mixers()
 		++nz;
 	}
 	if( !nz ) return;
-	int zn = ceil(sqrt(nz));
-	int x1 = 1 + gui->get_x(), x2 = cwindow->gui->get_x();
-	int y1 = 1, y2 = gui->get_y();
-	int rw = gui->get_root_w(0), rh = gui->get_root_h(0);
-	if( x1 < 0 ) x1 = 0;
-	if( y1 < 0 ) y1 = 0;
-	if( x2 > rw ) x2 = rw;
-	if( y2 > rh ) y2 = rh;
-	int dx = x2 - x1, dy = y2 - y1;
-	int zw = dx / zn;
 	int lt = BC_DisplayInfo::get_left_border();
 	int top = BC_DisplayInfo::get_top_border();
 	int bw = lt + BC_DisplayInfo::get_right_border();  // borders
 	int bh = top + BC_DisplayInfo::get_bottom_border();
-	int zx = 0, zy = 0;  // window origins
 	int mw = xS(10+10), mh = yS(10+10); // canvas margins
-	int rsz = 0, n = 0, dz = 0;
-	int ow = edl->session->output_w, oh = edl->session->output_h;
+	int dx = x2 - x1, dy = y2 - y1;
+	int64_t sz = dx * dy, best_r = sz;
+	int bx = 1, by = nz;
+	for( int nx=1; nx<=nz; ++nx ) {
+		int ny = ceil((double)nz / nx);
+		int zw = dx / nx;
+		int ww = zw - bw;
+		int hh = (ww - mw) * oh / ow + mh;
+		int zh = hh + bh;
+		int64_t za = zw*nx * zh*ny;
+		int64_t r = sz - za;
+		if( r < 0 ) continue;
+		if( r >= best_r ) continue;
+		best_r = r;
+		bx = nx;  by = ny;
+	}
+	for( int ny=1; ny<=nz; ++ny ) {
+		int nx = ceil((double)nz / ny);
+		int zh = dy / ny;
+		int hh = zh - bh;
+		int ww = (hh - mh) * ow / oh + mw;
+		int zw = ww + bw;
+		int64_t za = zw*nx * zh*ny;
+		int64_t r = sz - za;
+		if( r < 0 ) continue;
+		if( r >= best_r ) continue;
+		best_r = r;
+		bx = nx;  by = ny;
+	}
+	int zw, zh, ww, hh;
+	if( bx < by ) {
+		zh = dy / by;
+		hh = zh - bh;
+		ww = (hh - mh) * ow / oh + mw;
+		zw = ww + bw;
+	}
+	else {
+		zw = dx / bx;
+		ww = zw - bw;
+		hh = (ww - mw) * oh / ow + mh;
+		zh = hh + bh;
+	}
+
+	int zx = 0, zy = 0;  // window origins
+	int n = 0;
 	for( int i=0; i<zwindows.size(); ++i ) {
 		ZWindow *zwindow = zwindows[i];
 		if( zwindow->idx < 0 ) continue;
-		int ww = zw - bw, hh = (ww - mw) * oh / ow + mh, zh = hh + bh;
-		if( rsz < hh ) rsz = hh;
 		int xx = zx + x1, yy = zy + y1;
 		int mx = x2 - zw, my = y2 - zh;
 		if( xx > mx ) xx = mx;
 		if( yy > my ) yy = my;
-		xx += lt + xS(dz);  yy += top + yS(dz);
 		zwindow->reposition(xx,yy, ww,hh);
 		if( zwindow->running() ) {
 			ZWindowGUI *gui = (ZWindowGUI *)zwindow->get_gui();
@@ -1511,11 +1614,9 @@ void MWindow::tile_mixers()
 			gui->BC_WindowBase::reposition_window(xx,yy, ww,hh);
 			gui->unlock_window();
 		}
-		if( ++n >= zn ) {
-			n = 0;  rsz += bh;
-			if( (zy += rsz) > (dy - rsz) ) dz += 10;
-			rsz = 0;
-			zx = 0;
+		if( ++n >= bx ) {
+			zx = 0;  zy += zh;
+			n = 0;
 		}
 		else
 			zx += zw;
@@ -2949,6 +3050,25 @@ void MWindow::show_vwindow(int raise)
 	gui->mainmenu->show_vwindow->set_checked(1);
 }
 
+
+void MWindow::hide_vwindow(int raise)
+{
+	session->show_vwindow = 0;
+	int total_running = 0;
+
+	for(int j = 0; j < vwindows.size(); j++) {
+		VWindow *vwindow = vwindows[j];
+		if( !vwindow->is_running() ) continue;
+		total_running++;
+		if( !raise && !vwindow->gui->is_hidden() ) continue;
+		vwindow->gui->lock_window("MWindow::show_vwindow");
+		vwindow->gui->hide_window(0);
+		vwindow->gui->unlock_window();
+	}
+	gui->mainmenu->show_vwindow->set_checked(0);
+}
+
+
 void MWindow::show_awindow()
 {
 	session->show_awindow = 1;
@@ -2960,6 +3080,17 @@ void MWindow::show_awindow()
 	gui->mainmenu->show_awindow->set_checked(1);
 }
 
+void MWindow::hide_awindow()
+{
+	session->show_awindow = 0;
+
+	awindow->gui->lock_window("MWindow::show_awindow");
+	awindow->gui->hide_window();
+	awindow->gui->unlock_window();
+	gui->mainmenu->show_awindow->set_checked(0);
+}
+
+
 char *MWindow::get_cwindow_display()
 {
 	char *x11_host = screens < 2 || session->window_config == 0 ?
@@ -2975,6 +3106,18 @@ void MWindow::show_cwindow()
 	gui->mainmenu->show_cwindow->set_checked(1);
 }
 
+
+void MWindow::hide_cwindow()
+{
+	session->show_cwindow = 0;
+
+	cwindow->gui->lock_window("MWindow::show_cwindow");
+	cwindow->gui->hide_window();
+	cwindow->gui->unlock_window();
+	gui->mainmenu->show_cwindow->set_checked(0);
+}
+
+
 void MWindow::show_gwindow()
 {
 	session->show_gwindow = 1;
@@ -2987,6 +3130,7 @@ void MWindow::show_gwindow()
 
 	gui->mainmenu->show_gwindow->set_checked(1);
 }
+
 void MWindow::hide_gwindow()
 {
 	session->show_gwindow = 0;
@@ -2994,6 +3138,7 @@ void MWindow::hide_gwindow()
 	gwindow->gui->lock_window("MWindow::show_gwindow");
 	gwindow->gui->hide_window();
 	gwindow->gui->unlock_window();
+	gui->mainmenu->show_gwindow->set_checked(0);
 }
 
 void MWindow::show_lwindow()
@@ -3007,6 +3152,17 @@ void MWindow::show_lwindow()
 	gui->mainmenu->show_lwindow->set_checked(1);
 }
 
+void MWindow::hide_lwindow()
+{
+	session->show_lwindow = 0;
+
+	lwindow->gui->lock_window("MWindow::show_lwindow");
+	lwindow->gui->hide_window();
+	lwindow->gui->unlock_window();
+	gui->mainmenu->show_lwindow->set_checked(0);
+}
+
+
 void MWindow::restore_windows()
 {
 	gui->unlock_window();
@@ -3036,7 +3192,7 @@ void MWindow::restore_windows()
 		cwindow->gui->unlock_window();
 	}
 	else if( session->show_cwindow && cwindow->gui->is_hidden() )
-		cwindow->show_window();
+		show_cwindow();
 
 	if( !session->show_gwindow && !gwindow->gui->is_hidden() ) {
 		gwindow->gui->lock_window("MWindow::restore_windows");
@@ -3054,6 +3210,7 @@ void MWindow::restore_windows()
 	else if( session->show_lwindow && lwindow->gui->is_hidden() )
 		show_lwindow();
 
+	tile_mixers();
 	gui->lock_window("MWindow::restore_windows");
 	gui->focus();
 }
@@ -4166,6 +4323,25 @@ void MWindow::get_backup_path(char *path, int len)
 	cp += snprintf(cp, ep-cp, idx ? BACKUPn_FILE : BACKUP_FILE, idx);
 }
 
+void MWindow::create_timestamped_copy_from_previous_backup(char *previouspath)
+{
+  if (previouspath == NULL) return;
+  char backup_path[BCTEXTLEN];
+  backup_path[0] = 0;
+  time_t now = time(NULL);
+  struct tm* currenttime = localtime(&now);
+  snprintf(backup_path, sizeof(backup_path), 
+      "%s/%s_%d%.2d%.2d_%.2d%.2d%.2d",
+      File::get_config_path(), BACKUP_FILE1, 
+      currenttime->tm_year + 1900,
+      currenttime->tm_mon + 1,
+      currenttime->tm_mday,
+      currenttime->tm_hour,
+      currenttime->tm_min,
+      currenttime->tm_sec);
+	rename(previouspath, backup_path);
+}
+
 void MWindow::save_backup()
 {
 	FileXML file;
@@ -4176,6 +4352,8 @@ void MWindow::save_backup()
 	snprintf(backup_path1, sizeof(backup_path1), "%s/%s",
 		File::get_config_path(), BACKUP_FILE1);
 	get_backup_path(backup_path, sizeof(backup_path));
+	if( preferences->ongoing_backups )
+		create_timestamped_copy_from_previous_backup(backup_path1);
 	rename(backup_path, backup_path1);
 	edl->save_xml(&file, backup_path);
 	file.terminate_string();
@@ -4444,11 +4622,14 @@ static inline int gcd(int m, int n)
 int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 {
 	w = 1;  h = 1;
+	double ar;
+	
 	if(!width || !height) return 1;
 	if( width == 720 && (height == 480 || height == 576) ) {
 		w = 4;  h = 3;  return 0; // for NTSC and PAL
 	}
-	double ar = (double)width / height;
+	
+	ar = (double)width / height;
 // square-ish pixels
 	if( EQUIV(ar, 1.0000) ) return 0;
 	if( EQUIV(ar, 1.3333) ) { w = 4;  h = 3;  return 0; }
@@ -4456,6 +4637,8 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 	if( EQUIV(ar, 2.1111) ) { w = 19; h = 9;  return 0; }
 	if( EQUIV(ar, 2.2222) ) { w = 20; h = 9;  return 0; }
 	if( EQUIV(ar, 2.3333) ) { w = 21; h = 9;  return 0; }
+	if( EQUIV(ar, 2.37037) ) { w = 64; h = 27;  return 0; }
+
 	int ww = width, hh = height;
 	// numerator, denominator must be under mx
 	int mx = 255, n = gcd(ww, hh);
@@ -4999,12 +5182,26 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 		session->output_w = width;
 		session->output_h = height;
 		session->frame_rate = framerate;
+		session->interlace_mode = asset->interlace_mode;
 		// not, asset->actual_width/actual_height
 		asset->width = session->output_w;
 		asset->height = session->output_h;
 		asset->frame_rate = session->frame_rate;
+		
 		create_aspect_ratio(session->aspect_w, session->aspect_h,
 			session->output_w, session->output_h);
+	float ar = asset->aspect_ratio;
+	if (ar) {
+	//printf ("Aspect ratio from asset: %f \n", ar);
+	if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4;  session->aspect_h = 3;  }
+	if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9;   }
+	if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9;  }
+	if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9;   }
+	if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9;   }
+	if( EQUIV(ar, 2.370370) ) { session->aspect_w = 64; session->aspect_h = 27; }
+	}
+			
+			
 		Track *track = edl->tracks->first;
 		for( Track *next_track=0; track; track=next_track ) {
 			next_track = track->next;