X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_video_dialog.cc;h=a005b74467f5dfb12ead55cede5e9799b63e0d96;hb=af3056769cdc09d9ce3b21f9f8e0aa8145ed8f0e;hp=92e105a870198e933e5b36848c2c66ae1331d5d8;hpb=69d70bca3752d84740270903f414de94da2e2464;p=ardour.git

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 92e105a870..a005b74467 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <cmath>
 
@@ -70,7 +68,6 @@ AddVideoDialog::AddVideoDialog (Session* s)
 {
 	set_session (s);
 	set_name ("AddVideoDialog");
-	set_position (Gtk::WIN_POS_MOUSE);
 	set_modal (true);
 	set_skip_taskbar_hint (true);
 	set_resizable (true);
@@ -347,6 +344,15 @@ AddVideoDialog::auto_set_session_fps ()
 	return set_session_fps_checkbox.get_active();
 }
 
+void
+AddVideoDialog::clear_preview_image ()
+{
+	imgbuf->fill(RGBA_TO_UINT(0,0,0,255));
+	video_draw_cross(imgbuf);
+	preview_image->set(imgbuf);
+	preview_image->show();
+}
+
 void
 AddVideoDialog::set_action_ok (bool yn)
 {
@@ -359,10 +365,7 @@ AddVideoDialog::set_action_ok (bool yn)
 		pi_aspect.set_text("-");
 		pi_fps.set_text("-");
 		ok_button->set_sensitive(false);
-		imgbuf->fill(RGBA_TO_UINT(0,0,0,255));
-		video_draw_cross(imgbuf);
-		preview_image->set(imgbuf);
-		preview_image->show();
+		clear_preview_image();
 	}
 }
 
@@ -563,6 +566,8 @@ AddVideoDialog::request_preview(std::string u)
 		pi_tcout.set_text("-");
 		pi_aspect.set_text("-");
 		pi_fps.set_text("-");
+
+		clear_preview_image();
 		return;
 	}
 
@@ -581,57 +586,71 @@ AddVideoDialog::request_preview(std::string u)
 	const int arc = rint(video_aspect_ratio*100);
 
 	switch (arc) {
+		case 100:
+			pi_aspect.set_text(X_(" 1:1"));  // square (large format stills)
+			break;
+		case 125:
+			pi_aspect.set_text(X_(" 5:4"));
+			break;
 		case 133:
-			pi_aspect.set_text("4:3");
+			pi_aspect.set_text(X_(" 4:3"));
 			break;
 		case 134:
-			pi_aspect.set_text("47:35"); // 752x560
+			pi_aspect.set_text(X_(" 47:35")); // 752x560, Super8-scans
+			break;
+		case 137:
+		case 138:
+			pi_aspect.set_text(X_(" 1.37:1")); // 'Academy ratio' <= 1953
 			break;
 		case 141:
-			pi_aspect.set_text("1.41:1"); //  Lichtenberg ratio
+			pi_aspect.set_text(X_(" 1.41:1")); //  Lichtenberg ratio
 			break;
 		case 150:
-			pi_aspect.set_text("3:2");  // classic 35mm
+			pi_aspect.set_text(X_(" 3:2"));  // classic 35mm
 			break;
 		case 160:
-			pi_aspect.set_text("8:5");  // credit-card size
+			pi_aspect.set_text(X_(" 8:5"));  // credit-card size
 			break;
 		case 162:
-			pi_aspect.set_text("16:10"); // golden ratio 1.61803..
+			pi_aspect.set_text(X_(" 16:10")); // golden ratio 1.61803..
 			break;
 		case 166:
 		case 167:
-			pi_aspect.set_text("5:3");
+			pi_aspect.set_text(X_(" 5:3")); // Super16, EU-widescreen
 			break;
 		case 177:
 		case 178:
-			pi_aspect.set_text("16:9"); // HD video
+			pi_aspect.set_text(X_(" 16:9")); // HD video
 			break;
 		case 180:
-			pi_aspect.set_text("9:5");
+			pi_aspect.set_text(X_(" 9:5"));
 			break;
 		case 185:
-			pi_aspect.set_text("1.85:1"); // US widescreen cinema
+			pi_aspect.set_text(X_(" 1.85:1")); // US widescreen cinema
 			break;
 		case 200:
-			pi_aspect.set_text("2:1");
+			pi_aspect.set_text(X_(" 2:1"));
 			break;
 		case 239:
 		case 240:
-			pi_aspect.set_text("2.39:1"); // Anamorphic
+			pi_aspect.set_text(X_(" 2.40:1")); // Anamorphic
+			break;
+		case 266:
+		case 267:
+			pi_aspect.set_text(X_(" 2.66:1")); // CinemaScope
 			break;
 		case 275:
-			pi_aspect.set_text("2.75:1"); // Ultra Panavision
+			pi_aspect.set_text(X_(" 2.75:1")); // Ultra Panavision
 			break;
 		case 400:
-			pi_aspect.set_text("4.00:1"); // three 35mm 1.33:1 polyvision
+			pi_aspect.set_text(X_(" 4.00:1")); // three 35mm 1.33:1 polyvision
 			break;
 		default:
-			pi_aspect.set_text(string_compose("%1:1", video_aspect_ratio));
+			pi_aspect.set_text(string_compose(X_(" %1:1"), video_aspect_ratio));
 		break;
 	}
 
-	pi_fps.set_text(string_compose(_("%1 fps"), video_file_fps));
+	pi_fps.set_text(string_compose(_(" %1 fps"), video_file_fps));
 
 	clip_xoff = (PREVIEW_WIDTH - clip_width)/2;
 	clip_yoff = (PREVIEW_HEIGHT - clip_height)/2;
@@ -662,5 +681,3 @@ AddVideoDialog::request_preview(std::string u)
 	preview_image->set(imgbuf);
 	preview_image->show();
 }
-
-#endif /* WITH_VIDEOTIMELINE */