[longomatch] Factor our video formats a common file



commit d0d77fcc65745b2da2a8c3203a13e9ba4aef7dac
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sat Jun 5 19:46:46 2010 +0200

    Factor our video formats a common file

 LongoMatch/Common/Constants.cs                   |    9 +++++-
 LongoMatch/Gui/Component/ProjectDetailsWidget.cs |   20 +++++-------
 LongoMatch/Gui/Dialog/VideoEditionProperties.cs  |   35 +++++++++------------
 3 files changed, 31 insertions(+), 33 deletions(-)
---
diff --git a/LongoMatch/Common/Constants.cs b/LongoMatch/Common/Constants.cs
index 49fe731..87133a0 100644
--- a/LongoMatch/Common/Constants.cs
+++ b/LongoMatch/Common/Constants.cs
@@ -68,6 +68,13 @@ Petr Kovar (cs)";
 		
 		public const Key FRAMERATE_DOWN = Gdk.Key.Down;
 		
-		public const Key TOGGLE_PLAY = Gdk.Key.space;		
+		public const Key TOGGLE_PLAY = Gdk.Key.space;	
+		
+		/* Output formats */
+		public const string AVI = "AVI (XVID + MP3)";
+		public const string MP4  = "MP4 (H264 + AAC)";
+		public const string OGG  = "OGG (Theora + Vorbis)";
+		public const string WEBM = "WebM (VP8 + Vorbis)";
+		public const string DVD="DVD (MPEG-2 + MP3)";
 	}
 }
diff --git a/LongoMatch/Gui/Component/ProjectDetailsWidget.cs b/LongoMatch/Gui/Component/ProjectDetailsWidget.cs
index 1ede91c..a14cf2a 100644
--- a/LongoMatch/Gui/Component/ProjectDetailsWidget.cs
+++ b/LongoMatch/Gui/Component/ProjectDetailsWidget.cs
@@ -57,10 +57,6 @@ namespace LongoMatch.Gui.Component
 		private const string PAL_FORMAT = "720x576 (4:3)";
 		private const string PAL_3_4_FORMAT = "540x432 (4:3)";
 		private const string PAL_1_2_FORMAT = "360x288 (4:3)";
-		private const string AVI = "AVI (XVID + MP3)";
-		private const string MP4 = "MP4 (H264 + AAC)";
-		private const string OGG = "OGG (Theora + Vorbis)";
-		private const string WEBM= "WebM (VP8 + Vorbis)";
 		private const string DV_SOURCE = "DV Source";
 		private const string GCONF_SOURCE = "GConf Source";
 		
@@ -266,22 +262,22 @@ namespace LongoMatch.Gui.Component
 						break;
 				}
 				switch (videoformatcombobox.ActiveText){
-					case AVI:
+					case Constants.AVI:
 						s.VideoEncoder = VideoEncoderType.Xvid;
 						s.AudioEncoder = AudioEncoderType.Mp3;
 						s.Muxer = VideoMuxerType.Avi;
 						break;
-					case MP4:
+					case Constants.MP4:
 						s.VideoEncoder = VideoEncoderType.H264;
 						s.AudioEncoder = AudioEncoderType.Aac;
 						s.Muxer = VideoMuxerType.Mp4;
 						break;
-					case OGG:
+					case Constants.OGG:
 						s.VideoEncoder = VideoEncoderType.Theora;
 						s.AudioEncoder = AudioEncoderType.Vorbis;
 						s.Muxer = VideoMuxerType.Ogg;
 						break;
-					case WEBM:
+					case Constants.WEBM:
 						s.VideoEncoder = VideoEncoderType.VP8;
 						s.AudioEncoder = AudioEncoderType.Vorbis;
 						s.Muxer = VideoMuxerType.WebM;
@@ -422,10 +418,10 @@ namespace LongoMatch.Gui.Component
 			sizecombobox.AppendText(PAL_1_2_FORMAT);
 			sizecombobox.Active = 0;
 			
-			videoformatcombobox.AppendText(WEBM);
-			videoformatcombobox.AppendText(OGG);
-			videoformatcombobox.AppendText(MP4);
-			videoformatcombobox.AppendText(AVI);
+			videoformatcombobox.AppendText(Constants.WEBM);
+			videoformatcombobox.AppendText(Constants.OGG);
+			videoformatcombobox.AppendText(Constants.MP4);
+			videoformatcombobox.AppendText(Constants.AVI);
 			videoformatcombobox.Active = 0;
 		}
 		
diff --git a/LongoMatch/Gui/Dialog/VideoEditionProperties.cs b/LongoMatch/Gui/Dialog/VideoEditionProperties.cs
index fd278ba..94154ac 100644
--- a/LongoMatch/Gui/Dialog/VideoEditionProperties.cs
+++ b/LongoMatch/Gui/Dialog/VideoEditionProperties.cs
@@ -23,6 +23,7 @@ using Gtk;
 using Mono.Unix;
 using LongoMatch.Video.Editor;
 using LongoMatch.Video.Common;
+using LongoMatch.Common;
 
 namespace LongoMatch.Gui.Dialog
 {
@@ -37,23 +38,17 @@ namespace LongoMatch.Gui.Dialog
 		private AudioEncoderType acodec;
 		private VideoMuxerType muxer;
 
-		private const string MP4="MP4 (H.264+AAC)";
-		private const string AVI="AVI (Xvid+MP3)";
-		private const string OGG="OGG (Theora+Vorbis)";
-		private const string WEBM="WebM (VP8+Vorbis)";
-		private const string DVD="DVD (MPEG-2)";
-
 
 		#region Constructors
 		public VideoEditionProperties()
 		{
 			this.Build();
-			formatcombobox.AppendText(WEBM);
-			formatcombobox.AppendText(MP4);
-			formatcombobox.AppendText(AVI);
+			formatcombobox.AppendText(Constants.WEBM);
+			formatcombobox.AppendText(Constants.MP4);
+			formatcombobox.AppendText(Constants.AVI);
 			if (System.Environment.OSVersion.Platform != PlatformID.Win32NT) {
-				formatcombobox.AppendText(OGG);
-				formatcombobox.AppendText(DVD);
+				formatcombobox.AppendText(Constants.OGG);
+				formatcombobox.AppendText(Constants.DVD);
 			}
 			formatcombobox.Active=0;
 		}
@@ -113,13 +108,13 @@ namespace LongoMatch.Gui.Dialog
 		#region Private Methods
 
 		private string GetExtension() {
-			if (formatcombobox.ActiveText == MP4)
+			if (formatcombobox.ActiveText == Constants.MP4)
 				return "mkv";
-			else if (formatcombobox.ActiveText == OGG)
+			else if (formatcombobox.ActiveText == Constants.OGG)
 				return "ogg";
-			else if (formatcombobox.ActiveText == WEBM)
+			else if (formatcombobox.ActiveText == Constants.WEBM)
 				return "webm";
-			else if (formatcombobox.ActiveText == AVI)
+			else if (formatcombobox.ActiveText == Constants.AVI)
 				return "avi";
 			else
 				return "mpg";
@@ -144,27 +139,27 @@ namespace LongoMatch.Gui.Dialog
 
 			vf = (VideoFormat)sizecombobox.Active;
 
-			if (formatcombobox.ActiveText == MP4) {
+			if (formatcombobox.ActiveText == Constants.MP4) {
 				vcodec = VideoEncoderType.H264;
 				acodec = AudioEncoderType.Aac;
 				muxer = VideoMuxerType.Matroska;
 			}
-			else if (formatcombobox.ActiveText == OGG) {
+			else if (formatcombobox.ActiveText == Constants.OGG) {
 				vcodec = VideoEncoderType.Theora;
 				acodec = AudioEncoderType.Vorbis;
 				muxer = VideoMuxerType.Ogg;
 			}
-			else if (formatcombobox.ActiveText == WEBM) {
+			else if (formatcombobox.ActiveText == Constants.WEBM) {
 				vcodec = VideoEncoderType.VP8;
 				acodec = AudioEncoderType.Vorbis;
 				muxer = VideoMuxerType.WebM;
 			}
-			else if (formatcombobox.ActiveText == AVI) {
+			else if (formatcombobox.ActiveText == Constants.AVI) {
 				vcodec = VideoEncoderType.Xvid;
 				acodec = AudioEncoderType.Mp3;
 				muxer = VideoMuxerType.Avi;
 			}
-			else if (formatcombobox.ActiveText == DVD) {
+			else if (formatcombobox.ActiveText == Constants.DVD) {
 				vcodec = VideoEncoderType.Mpeg2;
 				acodec = AudioEncoderType.Mp3;
 				muxer = VideoMuxerType.MpegPS;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]