Packman Build Service PMBS

selene.changes Changed

selene.spec Changed

selene_2.6~200~ubuntu15.10.1.tar.xz/debian/bzr-builder.manifest -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest Changed

selene_2.6~200~ubuntu15.10.1.tar.xz/debian/changelog -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/debian/changelog Changed

@@ -1,11 +1,19 @@
-selene (2.6~200~ubuntu15.10.1) wily; urgency=low
+selene (2.6.1~206~ubuntu16.04.1) xenial; urgency=low
 
 * Auto build.
 
- -- Tony George <teejee2008@gmail.com> Wed, 21 Oct 2015 13:01:51 +0000
+ -- Tony George <teejee2008@gmail.com> Sat, 07 Nov 2015 14:15:55 +0000
 
-selene (2.6) trusty; urgency=low
+selene (2.6.1) trusty; urgency=medium
 
- * Minor UI changes
+ * Fixed: If framerate is fractional, then audio-video is out-of-sync for H264 video
 
- -- Tony George <tony.george.kol@gmail.com> Wed, 21 Oct 2015 14:00:00 +0530
+ * Fixed: Incorrect icon was displayed for 'About' button on toolbar
+
+ * Fixed: Input file properties were not parsed correctly for some files. These files would give a 'format not supported' error when added to the input list
+ 
+ * Perf: Query only required properties when reading file info from disk
+ 
+ * Added list of 3rd party tools to the About\Credits dialog
+
+ -- Tony George <tony.george.kol@gmail.com> Wed, 07 Nov 2015 10:00:00 +0530

selene_2.6~200~ubuntu15.10.1.tar.xz/selene.geany -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/selene.geany Changed

@@ -18,12 +18,16 @@
 
 [files]
 current_page=2
-FILE_NAME_0=9149;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
-FILE_NAME_1=1189;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
-FILE_NAME_2=26275;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
+FILE_NAME_0=39370;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
+FILE_NAME_1=51085;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
+FILE_NAME_2=47745;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
 FILE_NAME_3=618;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
-FILE_NAME_4=160;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
+FILE_NAME_4=133;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
 FILE_NAME_5=186;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
+FILE_NAME_6=342;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FDonationWindow.vala;0;4
+FILE_NAME_7=477;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
+FILE_NAME_8=1500;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
+FILE_NAME_9=8145;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAboutWindow.vala;0;4
 
 [VTE]
 last_dir=/home/teejee

selene_2.6~200~ubuntu15.10.1.tar.xz/selene.pot -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/selene.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: selene 2.2\n"
 "Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
-"POT-Creation-Date: 2015-10-21 18:23+0530\n"
+"POT-Creation-Date: 2015-11-07 19:28+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -179,7 +179,7 @@
 msgid "All files removed"
 msgstr ""
 
-#: MainWindow.vala:1546
+#: MainWindow.vala:1561
 msgid "An audio-video converter for Linux"
 msgstr ""
 
@@ -187,7 +187,7 @@
 msgid "Application Settings"
 msgstr ""
 
-#: AboutWindow.vala:330
+#: AboutWindow.vala:322
 #, c-format
 msgid "Artists"
 msgstr ""
@@ -257,7 +257,7 @@
 msgid "Browse"
 msgstr ""
 
-#: MainWindow.vala:1821
+#: MainWindow.vala:1836
 msgid "CPU: "
 msgstr ""
 
@@ -482,7 +482,7 @@
 msgid "Failed"
 msgstr ""
 
-#: Utility.vala:1396
+#: Utility.vala:1397
 msgid "Failed to set ownership"
 msgstr ""
 
@@ -552,7 +552,7 @@
 msgid "Following encoders are not installed on your system:"
 msgstr ""
 
-#: MainWindow.vala:1659
+#: MainWindow.vala:1674
 msgid "Following encoders were not found on your system:"
 msgstr ""
 
@@ -600,7 +600,7 @@
 msgid "Info"
 msgstr ""
 
-#: MainWindow.vala:1637
+#: MainWindow.vala:1652
 msgid ""
 "Input queue is empty!\n"
 "Please add some files.\n"
@@ -618,7 +618,7 @@
 msgid "Inverted Parabola"
 msgstr ""
 
-#: FileInfoWindow.vala:65
+#: FileInfoWindow.vala:69
 msgid "Key"
 msgstr ""
 
@@ -686,7 +686,7 @@
 msgid "Missing"
 msgstr ""
 
-#: Main.vala:309 MainWindow.vala:1659
+#: Main.vala:309 MainWindow.vala:1674
 msgid "Missing Encoders"
 msgstr ""
 
@@ -698,7 +698,7 @@
 msgid "Music"
 msgstr ""
 
-#: Main.vala:2869 MainWindow.vala:1322
+#: Main.vala:2876 MainWindow.vala:1322
 msgid "N/A"
 msgstr ""
 
@@ -786,7 +786,7 @@
 msgid "Output Location"
 msgstr ""
 
-#: MainWindow.vala:199 MainWindow.vala:1618 MainWindow.vala:1620
+#: MainWindow.vala:199 MainWindow.vala:1633 MainWindow.vala:1635
 msgid "Pause"
 msgstr ""
 
@@ -814,7 +814,7 @@
 msgid "Please enter a name for this preset"
 msgstr ""
 
-#: MainWindow.vala:1659
+#: MainWindow.vala:1674
 msgid "Please install required packages or select another preset"
 msgstr ""
 
@@ -830,7 +830,7 @@
 msgid "Preset deleted"
 msgstr ""
 
-#: MainWindow.vala:1753
+#: MainWindow.vala:1768
 msgid "Press 'Cancel' to abort shutdown"
 msgstr ""
 
@@ -854,7 +854,7 @@
 msgid "Quarter Sine"
 msgstr ""
 
-#: MainWindow.vala:1639
+#: MainWindow.vala:1654
 msgid "Queue is Empty"
 msgstr ""
 
@@ -891,7 +891,7 @@
 msgid "Resolution"
 msgstr ""
 
-#: MainWindow.vala:1612 MainWindow.vala:1614
+#: MainWindow.vala:1627 MainWindow.vala:1629
 msgid "Resume"
 msgstr ""
 
@@ -938,11 +938,11 @@
 msgid "Shutdown"
 msgstr ""
 
-#: MainWindow.vala:1591
+#: MainWindow.vala:1606
 msgid "Shutdown Disabled"
 msgstr ""
 
-#: MainWindow.vala:1588
+#: MainWindow.vala:1603
 msgid "Shutdown Enabled"
 msgstr ""
 
@@ -1037,11 +1037,11 @@
 msgid "Supported Formats:"
 msgstr ""
 
-#: MainWindow.vala:1755
+#: MainWindow.vala:1770
 msgid "System shutdown"
 msgstr ""
 
-#: MainWindow.vala:1762
+#: MainWindow.vala:1777
 #, c-format
 msgid "System shutdown was cancelled by user!"
 msgstr ""
@@ -1050,7 +1050,7 @@
 msgid "System will be shutdown after completion"
 msgstr ""
 
-#: Main.vala:676 MainWindow.vala:1752
+#: Main.vala:676 MainWindow.vala:1767
 msgid "System will shutdown in one minute!"
 msgstr ""
 
@@ -1071,16 +1071,16 @@
 "The 'Bilinear' filter gives smoother video (less detail) and smaller files."
 msgstr ""
 
-#: AboutWindow.vala:322
+#: AboutWindow.vala:338
 #, c-format
-msgid "Third Party Tools"
+msgid "Third Party Tools &amp; Software"
 msgstr ""
 
 #: AppConfigWindow.vala:91
 msgid "Tiles"
 msgstr ""
 
-#: AboutWindow.vala:338
+#: AboutWindow.vala:330
 #, c-format
 msgid "Translators"
 msgstr ""
@@ -1106,7 +1106,7 @@
 msgid "Using temp folder:"
 msgstr ""
 
-#: FileInfoWindow.vala:66
+#: FileInfoWindow.vala:70
 msgid "Value"
 msgstr ""

selene_2.6~200~ubuntu15.10.1.tar.xz/src/AboutWindow.vala -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/src/AboutWindow.vala Changed

@@ -318,14 +318,6 @@
 			add_line("\n");
 		}
 
-		if (third_party.length > 0){
-			add_line("%s\n".printf(_("Third Party Tools")));
-			foreach(string name in third_party){
-				add_line("%s\n".printf(name));
-			}
-			add_line("\n");
-		}
-
 		if (artists.length > 0){
 			add_line("%s\n".printf(_("Artists")));
 			foreach(string name in artists){
@@ -342,6 +334,14 @@
 			add_line("\n");
 		}
 
+		if (third_party.length > 0){
+			add_line("%s\n".printf(_("Third Party Tools &amp; Software")));
+			foreach(string name in third_party){
+				add_line("%s\n".printf(name));
+			}
+			add_line("\n");
+		}
+		
 		if (documenters.length > 0){
 			add_line("%s\n".printf(_("Documenters")));
 			foreach(string name in documenters){
@@ -365,14 +365,15 @@
 
 	public void add_line(string text){
 		if (text.split(":").length >= 2){
-			var link = new LinkButton(text.split(":")[0]);
+			var txt = break_string_by_word(text.split(":")[0].strip());
+			var link = new LinkButton(txt);
 			vbox_lines.add(link);
 
-			string val = text[text.index_of(":") + 1:text.length];
+			string val = text[text.index_of(":") + 1:text.length]; //break at first colon
 			if (val.contains("@")){
 				link.uri = "mailto:" + val;
 			}
-			else if(val.has_prefix("http://")){
+			else if(val.has_prefix("http://") || val.has_prefix("https://")){
 				link.uri = val;
 			}
 			else{
@@ -389,7 +390,8 @@
 			});
 		}
 		else{
-			var lbl = new Label(text);
+			var txt = break_string_by_word(text);
+			var lbl = new Label(txt);
 			lbl.set_use_markup(true);
 			lbl.valign = Align.START;
 			lbl.wrap = true;

selene_2.6~200~ubuntu15.10.1.tar.xz/src/FileInfoWindow.vala -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/src/FileInfoWindow.vala Changed

selene_2.6~200~ubuntu15.10.1.tar.xz/src/Main.vala -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/src/Main.vala Changed

@@ -38,7 +38,7 @@
 public Main App;
 public const string AppName = "Selene";
 public const string AppShortName = "selene";
-public const string AppVersion = "2.6";
+public const string AppVersion = "2.6.1";
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "teejeetech@gmail.com";
 
@@ -417,7 +417,7 @@
 		Encoders["sox"] = new Encoder("sox","SoX Audio Processing Utility","Sound Effects");
 		Encoders["vpxenc"] = new Encoder("vpxenc","VP8 Video Encoder","VP8/WebM Output");
 		Encoders["x264"] = new Encoder("x264","H.264 / MPEG-4 AVC Video Encoder","H264 Output");
-		Encoders["x265"] = new Encoder("x264","H.265 / MPEG-H HEVC Video Encoder","H265 Output");
+		Encoders["x265"] = new Encoder("x265","H.265 / MPEG-H HEVC Video Encoder","H265 Output");
 	}
 
 	public void check_all_encoders(){
@@ -2603,10 +2603,13 @@
 	public string ProgressText = _("Queued");
 	public int ProgressPercent = 0;
 
-	public string InfoText;
+	public string InfoText = "";
+	public string InfoTextFormatted = "";
+	
 	public bool HasAudio = false;
 	public bool HasVideo = false;
 	public bool HasSubs = false;
+	
 	public int SourceWidth = 0;
 	public int SourceHeight = 0;
 	public double SourceFrameRate = 0;
@@ -2641,7 +2644,7 @@
 		FileInfo fi = null;
 
 		try{
-			fi = f.query_info ("*", FileQueryInfoFlags.NONE, null);
+			fi = f.query_info ("%s".printf(FileAttribute.STANDARD_SIZE), FileQueryInfoFlags.NONE, null);
 			Size = fi.get_size();
 		}
 		catch (Error e) {
@@ -2656,7 +2659,7 @@
 		// search for subtitle files ---------------
 
 		try{
-	        var enumerator = fp.enumerate_children ("standard::*", 0);
+	        var enumerator = fp.enumerate_children ("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), 0);
 			var fileInfo = enumerator.next_file();
 	        while (fileInfo != null) {
 	            if (fileInfo.get_file_type() == FileType.REGULAR) {
@@ -2686,7 +2689,7 @@
 	}
 
 	public void query_mediainfo(){
-		InfoText = get_mediainfo (Path);
+		InfoText = get_mediainfo (Path, true);
 
 		if (InfoText == null || InfoText == ""){
 			return;
@@ -2724,7 +2727,7 @@
 
 				if (sectionType	== "general"){
 					switch (key.down()) {
-						case "duration":
+						case "duration/string":
 							Duration = 0;
 							foreach(string p in val.split(" ")){
 								string part = p.strip().down();
@@ -2738,10 +2741,10 @@
 									Duration += long.parse(part.replace ("s","")) * 1000;
 							}
 							break;
-						case "track name":
+						case "track":
 							TrackName = val;
 							break;
-						case "track name/position":
+						case "track/position":
 							TrackNumber = val;
 							break;
 						case "album":
@@ -2753,7 +2756,7 @@
 						case "genre":
 							Genre = val;
 							break;
-						case "recorded date":
+						case "recorded_date":
 							RecordedDate = val;
 							break;
 						case "comment":
@@ -2766,15 +2769,15 @@
 				}
 				else if (sectionType == "video"){
 					switch (key.down()) {
-						case "width":
-							SourceWidth = int.parse(val.replace ("pixels","").replace (" ","").strip());
+						case "width/string":
+							SourceWidth = int.parse(val.split(" ")[0].strip());
 							break;
-						case "height":
-							SourceHeight = int.parse(val.replace ("pixels","").replace (" ","").strip());
+						case "height/string":
+							SourceHeight = int.parse(val.split(" ")[0].strip());
 							break;
-						case "frame rate":
-						case "original frame rate":
-							SourceFrameRate = int.parse(val.replace ("fps","").replace (" ","").strip());
+						case "framerate/string":
+						case "framerate_original/string":
+							SourceFrameRate = double.parse(val.split(" ")[0].strip());
 							break;
 						case "format":
 							VideoFormat = val;
@@ -2783,8 +2786,8 @@
 				}
 				else if (sectionType == "audio"){
 					switch (key.down()) {
-						case "channel(s)":
-							AudioChannels = int.parse(val.replace ("channels","").replace ("channel","").strip());
+						case "channel(s)/string":
+							AudioChannels = int.parse(val.split(" ")[0].strip());
 							break;
 						case "format":
 							AudioFormat = val;
@@ -2795,6 +2798,10 @@
 		}
 	}
 
+	public void query_mediainfo_formatted(){
+		InfoTextFormatted = get_mediainfo (Path, false);
+	}
+
 	public void prepare (string baseTempDir){
 		TempDirectory = baseTempDir + "/" + timestamp2() + " - " + Name;
 		LogFile = TempDirectory + "/" + "log.txt";

selene_2.6~200~ubuntu15.10.1.tar.xz/src/MainWindow.vala -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/src/MainWindow.vala Changed

@@ -251,7 +251,7 @@
 		//btnAbout
 		btnAbout = new Gtk.ToolButton.from_stock ("gtk-about");
 		btnAbout.is_important = false;
-		btnAbout.icon_widget = get_shared_icon("","help-info.svg",24);
+		btnAbout.icon_widget = get_shared_icon("gtk-about","help-info.svg",24);
 		btnAbout.clicked.connect (btnAbout_clicked);
 		btnAbout.set_tooltip_text (_("About"));
 		toolbar.add (btnAbout);
@@ -712,7 +712,7 @@
 	private void iter_append_children (TreeStore model, TreeIter iter0, string path){
 		try{
 			var dir = File.parse_name (path);
-			var enumerator = dir.enumerate_children ("standard::*", 0);
+			var enumerator = dir.enumerate_children ("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), 0);
 			FileInfo file;
 			TreeIter iter1;
 
@@ -743,7 +743,7 @@
 		try
 		{
 			var dir = File.parse_name (path);
-	 var enumerator = dir.enumerate_children ("standard::*", 0);
+	 var enumerator = dir.enumerate_children ("%s".printf(FileAttribute.STANDARD_NAME), 0);
 			Gee.ArrayList<string> files = new Gee.ArrayList<string>();
 
 	 FileInfo file;
@@ -1538,6 +1538,21 @@
 			"Felix Moreno (Spanish):launchpad.net/~felix-justdust"
 		};
 
+		dialog.third_party = {
+			"x264 by Laurent Aimar, Loren Merritt, Fiona Glaser, Anton Mitrofanov and Henrik Gramner:http://www.videolan.org/developers/x264.html",
+			"x265 by MulticoreWare and the x265 development team:http://x265.org/",
+			"Ogg, Opus and Theora by Xiph.org:http://www.opus-codec.org/",
+			"WebM, VP8 and VP9 by On2, Xiph, Matroska and Google:http://www.webmproject.org/",
+			"ffmpeg by Fabrice Bellard:http://ffmpeg.org/",
+			"LAME MP3 Encoder by the LAME development team:http://lame.sourceforge.net/",
+			"Nero AAC Codec by Nero AG:http://www.nero.com/enu/company/about-nero/nero-aac-codec.php",
+			"SoX by Chris Bagwell and others:http://sox.sourceforge.net/",
+			"MediaInfo by Jérôme Martinez:http://mediaarea.net/MediaInfo",
+			"MKVToolNix by Moritz Bunkus:http://bunkus.org/videotools/mkvtoolnix/",
+			"MP4Box from the GPAC project:http://gpac.io/",
+			"ffmpeg2theora by Jan Gerber:http://v2v.cc/~j/ffmpeg2theora/"
+		};
+		
 		dialog.documenters = null;
 		dialog.artists = null;
 		dialog.donations = null;

selene_2.6~200~ubuntu15.10.1.tar.xz/src/Utility.vala -> selene_2.6.1~206~ubuntu16.04.1.tar.xz/src/Utility.vala Changed

@@ -1114,14 +1114,15 @@
 			return "%i:%i:%i:%i".printf(w,h,x,y);
 	}
 
-	public string get_mediainfo (string filePath){
+	public string get_mediainfo (string filePath, bool getRawText){
 
 		/* Returns the multimedia properties of an audio/video file using MediaInfo */
 
 		string output = "";
 
 		try {
-			Process.spawn_command_line_sync("mediainfo \"%s\"".printf(filePath), out output);
+			string cmd = "mediainfo%s '%s'".printf((getRawText ? " --Language=raw" : ""), filePath);
+			Process.spawn_command_line_sync(cmd, out output);
 		}
 		catch(Error e){
 	        log_error (e.message);
@@ -1724,4 +1725,23 @@
 		.replace("&gt;",">")
 		;
 	}
+
+	public string break_string_by_word(string input_text){
+		string text = "";
+		string line = "";
+		foreach(string part in input_text.split(" ")){
+			line += part + " ";
+			if (line.length > 50){
+				text += line.strip() + "\n";
+				line = "";
+			}
+		}
+		if (line.length > 0){
+			text += line;
+		}
+		if (text.has_suffix("\n")){
+			text = text[0:text.length-1].strip();
+		}
+		return text;
+	}
 }

Changes of Revision 4