Packman Build Service PMBS

selene.changes Changed

selene.spec Changed

@@ -16,20 +16,20 @@
 #
 
 
-%define _version 16.5.0~283~ubuntu16.04.1
+%define _version 16.9~287~ubuntu16.04.1
 Name:           selene
-Version:        16.5.0
+Version:        16.9
 Release:        0
 Summary:        GUI audio-video converter for GNU/Linux
 License:        GPL-3.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            https://launchpad.net/selene
-Source:         http://ppa.launchpad.net/teejee2008/ppa/ubuntu/pool/main/s/%{name}/%{name}_%{_version}.tar.xz
+Source:         https://launchpad.net/~teejee2008/+archive/ubuntu/ppa/+files/%{name}_%{_version}.tar.xz
 # PATCH-FIX-OPENSUSE selene-fix-makefile.patch sor.alexei@meowr.ru -- Various Makefile fixes.
 Patch0:         %{name}-fix-makefile.patch
 BuildRequires:  fdupes
 BuildRequires:  gettext
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  vala
 BuildRequires:  pkgconfig(gdk-x11-3.0)
@@ -72,7 +72,7 @@
 done
 
 %build
-make %{?_smp_mflags} \
+make %{?_smp_mflags} V=1 \
   CFLAGS="%{optflags}" \
   libdir=%{_libdir}

selene_16.5.0~283~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest -> selene_16.9~287~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest Changed

selene_16.5.0~283~ubuntu16.04.1.tar.xz/debian/changelog -> selene_16.9~287~ubuntu16.04.1.tar.xz/debian/changelog Changed

selene_16.5.0~283~ubuntu16.04.1.tar.xz/selene.geany -> selene_16.9~287~ubuntu16.04.1.tar.xz/selene.geany Changed

@@ -17,10 +17,10 @@
 long_line_column=80
 
 [files]
-current_page=18
+current_page=1
 FILE_NAME_0=23970;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
-FILE_NAME_1=1200;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
-FILE_NAME_2=6719;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
+FILE_NAME_1=53290;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
+FILE_NAME_2=6735;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
 FILE_NAME_3=2267;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
 FILE_NAME_4=1516;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAboutWindow.vala;0;4
 FILE_NAME_5=826;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
@@ -29,14 +29,14 @@
 FILE_NAME_8=2607;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCustomMessageDialog.vala;0;4
 FILE_NAME_9=2819;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFFmpegBuilder.vala;0;4
 FILE_NAME_10=4148;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FSimpleProgressWindow.vala;0;4
-FILE_NAME_11=78305;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
+FILE_NAME_11=71352;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
 FILE_NAME_12=981;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
-FILE_NAME_13=182;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
-FILE_NAME_14=3218;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayer.vala;0;4
+FILE_NAME_13=286;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
+FILE_NAME_14=11321;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayer.vala;0;4
 FILE_NAME_15=13049;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaFile.vala;0;4
 FILE_NAME_16=2475;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FBatchEditWindow.vala;0;4
-FILE_NAME_17=748;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
-FILE_NAME_18=2202;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayerWindow.vala;0;4
+FILE_NAME_17=550;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
+FILE_NAME_18=1942;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayerWindow.vala;0;4
 FILE_NAME_19=7859;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FClasses.vala;0;4
 
 [VTE]

selene_16.5.0~283~ubuntu16.04.1.tar.xz/selene.pot -> selene_16.9~287~ubuntu16.04.1.tar.xz/selene.pot Changed

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Tony George (teejee2008@gmail.com)
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the selene package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: selene 2.2\n"
 "Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
-"POT-Creation-Date: 2016-05-15 11:48+0530\n"
+"POT-Creation-Date: 2016-09-14 20:42+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"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: EncoderConfigWindow.vala:2094
+#: EncoderConfigWindow.vala:2147
 msgid ""
 "\n"
 "Note:\n"
@@ -33,7 +33,7 @@
 "multiple segments using advanced mode will not work."
 msgstr ""
 
-#: EncoderConfigWindow.vala:3012
+#: EncoderConfigWindow.vala:3065
 msgid ""
 "\n"
 "Note:\n"
@@ -41,7 +41,7 @@
 "1. Supported subtitle file formats:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:2587
+#: EncoderConfigWindow.vala:2640
 msgid ""
 "\n"
 "Note:\n"
@@ -64,7 +64,7 @@
 msgid "100%"
 msgstr ""
 
-#: EncoderConfigWindow.vala:3032
+#: EncoderConfigWindow.vala:3085
 msgid ""
 "2. External subtitle files must be present in the same location and start "
 "with the same file name."
@@ -86,14 +86,14 @@
 msgid "75%"
 msgstr ""
 
-#: EncoderConfigWindow.vala:669 EncoderConfigWindow.vala:670
+#: EncoderConfigWindow.vala:683 EncoderConfigWindow.vala:684
 msgid ""
 "AAC-ELD\n"
 "Enhanced Low Delay Profile for real-time communication\n"
 "\n"
 msgstr ""
 
-#: EncoderConfigWindow.vala:665
+#: EncoderConfigWindow.vala:679
 msgid ""
 "AAC-LC (Recommended)\n"
 "MPEG-2 Low-complexity (LC) combined with MPEG-4 Perceptual Noise "
@@ -101,14 +101,14 @@
 "\n"
 msgstr ""
 
-#: EncoderConfigWindow.vala:668
+#: EncoderConfigWindow.vala:682
 msgid ""
 "AAC-LD\n"
 "Low Delay Profile for real-time communication\n"
 "\n"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1425
+#: EncoderConfigWindow.vala:1439
 msgid ""
 "Additional Options\n"
 "These options will be passed to the encoder\n"
@@ -116,11 +116,11 @@
 "any options that are already provided by the GUI."
 msgstr ""
 
-#: EncoderConfigWindow.vala:802
+#: EncoderConfigWindow.vala:816
 msgid "Adjustments:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:554
+#: EncoderConfigWindow.vala:568
 msgid "Audio Encoder"
 msgstr ""
 
@@ -128,11 +128,11 @@
 msgid "Backup Directory"
 msgstr ""
 
-#: EncoderConfigWindow.vala:727
+#: EncoderConfigWindow.vala:741
 msgid "Channels"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1357
+#: EncoderConfigWindow.vala:1371
 msgid ""
 "Compression Vs Device Compatibility\n"
 "'High' profile gives the best compression.\n"
@@ -141,14 +141,14 @@
 "support the 'High' profile"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1315
+#: EncoderConfigWindow.vala:1329
 msgid ""
 "Compression Vs Encoding Speed\n"
 "Slower presets give better compression and smaller files\n"
 "but take more time to encode."
 msgstr ""
 
-#: EncoderConfigWindow.vala:1293
+#: EncoderConfigWindow.vala:1307
 msgid ""
 "Compression Vs Quality\n"
 "Smaller values give better quality video and larger files"
@@ -158,7 +158,7 @@
 msgid "Default Language"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1702
+#: EncoderConfigWindow.vala:1716
 msgid ""
 "Embed - Subtitle files will be combined with the output file.\n"
 "These subtitles can be switched off since they are added as a separate track"
@@ -171,11 +171,11 @@
 "\n"
 msgstr ""
 
-#: EncoderConfigWindow.vala:964
+#: EncoderConfigWindow.vala:978
 msgid "Fade:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:415
+#: EncoderConfigWindow.vala:429
 msgid "File Format"
 msgstr ""
 
@@ -183,14 +183,14 @@
 msgid "File Handling"
 msgstr ""
 
-#: EncoderConfigWindow.vala:667
+#: EncoderConfigWindow.vala:681
 msgid ""
 "HE-AAC v2\n"
 "AAC-LC + SBR + PS (Parametric Stereo)\n"
 "\n"
 msgstr ""
 
-#: EncoderConfigWindow.vala:666
+#: EncoderConfigWindow.vala:680
 msgid ""
 "HE-AAC\n"
 "AAC-LC + SBR (Spectral Band Replication)\n"
@@ -201,7 +201,7 @@
 msgid "Main Window"
 msgstr ""
 
-#: EncoderConfigWindow.vala:671
+#: EncoderConfigWindow.vala:685
 msgid ""
 "Note:\n"
 "HE-AAC and HE-AACv2 are used for low-bitrate encoding while HE-LD and HE-ELD "
@@ -210,7 +210,7 @@
 "low as 32 kbps."
 msgstr ""
 
-#: EncoderConfigWindow.vala:1058
+#: EncoderConfigWindow.vala:1072
 msgid "Other Effects:"
 msgstr ""
 
@@ -222,11 +222,11 @@
 msgid "Preferred Tools"
 msgstr ""
 
-#: EncoderConfigWindow.vala:475
+#: EncoderConfigWindow.vala:489
 msgid "Preset"
 msgstr ""
 
-#: EncoderConfigWindow.vala:2659

selene_16.5.0~283~ubuntu16.04.1.tar.xz/src/EncoderConfigWindow.vala -> selene_16.9~287~ubuntu16.04.1.tar.xz/src/EncoderConfigWindow.vala Changed

@@ -50,6 +50,7 @@
 	private Gtk.Grid grid_subs;
 	private Gtk.Grid grid_vf;
 	private Gtk.Grid grid_af;
+	private Gtk.Grid grid_tags;
 
 	//preset
 	private Gtk.Entry txt_preset_name;
@@ -142,6 +143,9 @@
 	private Gtk.ComboBox cmb_sub_mode;
 	private Gtk.Label lbl_scodec_msg;
 
+	// tags
+	private Gtk.CheckButton chk_copy_tags;
+
 	private uint tmr_init = 0;
 
 	// actions
@@ -194,6 +198,8 @@
 		
 		init_ui_subtitles();
 
+		init_ui_tags();
+
 		// Actions ----------------------------------------------
 
 		var vbox = get_action_area();
@@ -324,6 +330,9 @@
 		case "subs":
 			notebook.set_current_page(6);
 			break;
+		case "tags":
+			notebook.set_current_page(7);
+			break;
 		}
 	}
 	
@@ -390,6 +399,11 @@
 		model.set (iter, 0, _("Subtitles"));
 		model.set (iter, 1, "subs");
 		model.set (iter, 2, pix_subs);
+
+		model.append(out iter);
+		model.set (iter, 0, _("Tags"));
+		model.set (iter, 1, "tags");
+		model.set (iter, 2, pix_subs);
 		
 		tv_pages.set_model(model);
 	}
@@ -1113,7 +1127,7 @@
 		link.activate_link.connect(()=>{ return exo_open_url(link.uri); });
 vboxSoxOuter.pack_end(link,true,true,0);
 	}
-
+	
 	/*private void show_popover_audio(Gtk.Image img, string sox_options){
 		var pop = new Gtk.Popover(img);
 		pop.modal = true;
@@ -1737,6 +1751,45 @@
 		grid.attach(label,0,++row,3,1);
 		lbl_scodec_msg = label;
 	}
+
+	private void init_ui_tags(){
+		
+		// add tab page -------------------------
+		
+		var label = new Label (_("Tags"));
+
+		var grid = new Grid();
+		grid.set_column_spacing (12);
+		grid.set_row_spacing (6);
+		grid.margin = 12;
+		grid.visible = false;
+		notebook.append_page (grid, label);
+		grid_tags = grid;
+		
+		int row = -1;
+		int col;
+
+		// resample -----------------------------------------
+		
+		label = new Gtk.Label(_("Tags"));
+		label.set_use_markup(true);
+		label.xalign = (float) 0.0;
+		label.margin_top = 6;
+		label.margin_bottom = 6;
+		grid.attach(label,col=0,++row,2,1);
+
+		// chk_box_fit ---------------------------
+
+		var tt = _("Copy tags (artist, album, etc) from the source file to output file");
+
+		var chk = new CheckButton.with_label(_("Copy tags from source file"));
+		chk.active = true;
+		chk.margin_left = 12;
+		chk.margin_top = 6;
+		chk.set_tooltip_markup(tt);
+		grid.attach(chk,0,++row,3,1);
+		chk_copy_tags = chk;
+	}
 	
 	private bool on_delete_event(Gdk.EventAny event){
 		this.delete_event.disconnect(on_delete_event); //disconnect this handler
@@ -3128,6 +3181,7 @@
 		var video = new Json.Object();
 		var audio = new Json.Object();
 		var subs = new Json.Object();
+		var tags = new Json.Object();
 
 		config.set_object_member("general",general);
 		general.set_string_member("format",format);
@@ -3197,6 +3251,9 @@
 		config.set_object_member("subtitle",subs);
 		subs.set_string_member("mode",subtitle_mode);
 
+		config.set_object_member("tags",tags);
+		tags.set_boolean_member("copyTags",copy_tags);
+
 		var filePath = Folder + "/" + txt_preset_name.text + ".json";
 		var json = new Json.Generator();
 		json.pretty = true;
@@ -3336,6 +3393,13 @@
 
 		subtitle_mode = subs.get_string_member("mode");
 
+		// tags -----------------------
+
+		if (config.has_member("tags")){
+			Json.Object tags = (Json.Object) config.get_object_member("tags");
+			copy_tags = tags.get_boolean_member("copyTags");
+		}
+
 		Main.set_numeric_locale("");
 	}
 
@@ -3726,4 +3790,13 @@
 			gtk_combobox_set_value(cmb_sub_mode, 1, value);
 		}
 }
+
+ public bool copy_tags{
+		get {
+			return chk_copy_tags.active;
+		}
+ set {
+			chk_copy_tags.set_active((bool)value);
+		}
+ }
 }

selene_16.5.0~283~ubuntu16.04.1.tar.xz/src/Main.vala -> selene_16.9~287~ubuntu16.04.1.tar.xz/src/Main.vala Changed

@@ -1,7 +1,7 @@
 /*
 * Main.vala
 *
- * Copyright 2012 Tony George <teejee2008@gmail.com>
+ * Copyright 2016 Tony George <teejee2008@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
 public Main App;
 public const string AppName = "Selene Media Converter";
 public const string AppShortName = "selene";
-public const string AppVersion = "16.5.0";
+public const string AppVersion = "16.9";
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "teejeetech@gmail.com";
 
@@ -1982,6 +1982,8 @@
 		return s;
 	}
 
+	// encode subs ---------------------
+	
 	private string encode_sub_avconv(MediaFile mf, TextStream stream, Json.Object settings){
 		string s = "";
 
@@ -2004,7 +2006,9 @@
 
 		if (stream.IsExternal){
 			//character encoding - required for SRT files
-			s += " -sub_charenc \"%s\"".printf(stream.CharacterEncoding.up());
+			if (!stream.CharacterEncoding.up().contains("UNKNOWN")){
+				s += " -sub_charenc \"%s\"".printf(stream.CharacterEncoding.up());
+			}
 
 			//input
 			s += " -i \"%s\"".printf(stream.SubFile);
@@ -2911,14 +2915,25 @@
 		}
 
 		//tags
-		s += (mf.TrackName.length > 0) ? " -metadata 'title'=\"${tagTitle}\"" : "";
-		s += (mf.TrackNumber.length > 0) ? " -metadata 'track'=\"${tagTrackNum}\"" : "";
-		s += (mf.Artist.length > 0) ? " -metadata 'artist'=\"${tagArtist}\"" : "";
-		s += (mf.Album.length > 0) ? " -metadata 'album'=\"${tagAlbum}\"" : "";
-		s += (mf.Genre.length > 0) ? " -metadata 'genre'=\"${tagGenre}\"" : "";
-		s += (mf.RecordedDate.length > 0) ? " -metadata 'year'=\"${tagYear}\"" : "";
-		s += (mf.Comment.length > 0) ? " -metadata 'comment'=\"${tagComment}\"" : "";
+		bool copy_tags = true;
+		if (settings.has_member("tags")){
+			Json.Object tags = (Json.Object) settings.get_object_member("tags");
+			copy_tags = tags.get_boolean_member("copyTags");
+		}
 
+		if (copy_tags){
+			s += (mf.TrackName.length > 0) ? " -metadata 'title'=\"${tagTitle}\"" : "";
+			s += (mf.TrackNumber.length > 0) ? " -metadata 'track'=\"${tagTrackNum}\"" : "";
+			s += (mf.Artist.length > 0) ? " -metadata 'artist'=\"${tagArtist}\"" : "";
+			s += (mf.Album.length > 0) ? " -metadata 'album'=\"${tagAlbum}\"" : "";
+			s += (mf.Genre.length > 0) ? " -metadata 'genre'=\"${tagGenre}\"" : "";
+			s += (mf.RecordedDate.length > 0) ? " -metadata 'year'=\"${tagYear}\"" : "";
+			s += (mf.Comment.length > 0) ? " -metadata 'comment'=\"${tagComment}\"" : "";
+		}
+		else{
+			s += " -map_metadata -1";
+		}
+		
 		s += " -vn -sn";
 
 		//output
@@ -2959,13 +2974,23 @@
 				s += " -b " + audio.get_string_member("bitrate") + " --cbr";
 				break;
 		}
-		s += (mf.TrackName.length > 0) ? " --tt \"${tagTitle}\"" : "";
-		s += (mf.TrackNumber.length > 0) ? " --tn \"${tagTrackNum}\"" : "";
-		s += (mf.Artist.length > 0) ? " --ta \"${tagArtist}\"" : "";
-		s += (mf.Album.length > 0) ? " --tl \"${tagAlbum}\"" : "";
-		s += (mf.Genre.length > 0) ? " --tg \"${tagGenre}\"" : "";
-		s += (mf.RecordedDate.length > 0) ? " --ty \"${tagYear}\"" : "";
-		s += (mf.Comment.length > 0) ? " --tc \"${tagComment}\"" : "";
+
+		//tags
+		bool copy_tags = true;
+		if (settings.has_member("tags")){
+			Json.Object tags = (Json.Object) settings.get_object_member("tags");
+			copy_tags = tags.get_boolean_member("copyTags");
+		}
+
+		if (copy_tags){
+			s += (mf.TrackName.length > 0) ? " --tt \"${tagTitle}\"" : "";
+			s += (mf.TrackNumber.length > 0) ? " --tn \"${tagTrackNum}\"" : "";
+			s += (mf.Artist.length > 0) ? " --ta \"${tagArtist}\"" : "";
+			s += (mf.Album.length > 0) ? " --tl \"${tagAlbum}\"" : "";
+			s += (mf.Genre.length > 0) ? " --tg \"${tagGenre}\"" : "";
+			s += (mf.RecordedDate.length > 0) ? " --ty \"${tagYear}\"" : "";
+			s += (mf.Comment.length > 0) ? " --tc \"${tagComment}\"" : "";
+		}
 
 		s += " -";
 		if (mf.HasVideo && video.get_string_member("codec") != "disable") {
@@ -3034,21 +3059,32 @@
 			s += "\n";
 			
 			//add tags
-			string tags = "";
+			string alltags = "";
 			string path = get_cmd_path ("neroAacTag");
 			if ((path != null) && (path.length > 0)){
-				tags += (mf.TrackName.length > 0) ? " -meta:title=\"${tagTitle}\"" : "";
-				tags += (mf.TrackNumber.length > 0) ? " -meta:track=\"${tagTrackNum}\"" : "";
-				tags += (mf.Artist.length > 0) ? " -meta:artist=\"${tagArtist}\"" : "";
-				tags += (mf.Album.length > 0) ? " -meta:album=\"${tagAlbum}\"" : "";
-				tags += (mf.Genre.length > 0) ? " -meta:genre=\"${tagGenre}\"" : "";
-				tags += (mf.RecordedDate.length > 0) ? " -meta:year=\"${tagYear}\"" : "";
-				tags += (mf.Comment.length > 0) ? " -meta:comment=\"${tagComment}\"" : "";
-				if (tags.length > 0){
-					s += "neroAacTag";
-					s += " \"${outputFile}\"";
-					s += tags;
-					s += "\n";
+
+				//tags
+				bool copy_tags = true;
+				if (settings.has_member("tags")){
+					Json.Object tags = (Json.Object) settings.get_object_member("tags");
+					copy_tags = tags.get_boolean_member("copyTags");
+				}
+
+				if (copy_tags){
+					alltags += (mf.TrackName.length > 0) ? " -meta:title=\"${tagTitle}\"" : "";
+					alltags += (mf.TrackNumber.length > 0) ? " -meta:track=\"${tagTrackNum}\"" : "";
+					alltags += (mf.Artist.length > 0) ? " -meta:artist=\"${tagArtist}\"" : "";
+					alltags += (mf.Album.length > 0) ? " -meta:album=\"${tagAlbum}\"" : "";
+					alltags += (mf.Genre.length > 0) ? " -meta:genre=\"${tagGenre}\"" : "";
+					alltags += (mf.RecordedDate.length > 0) ? " -meta:year=\"${tagYear}\"" : "";
+					alltags += (mf.Comment.length > 0) ? " -meta:comment=\"${tagComment}\"" : "";
+					
+					if (alltags.length > 0){
+						s += "neroAacTag";
+						s += " \"${outputFile}\"";
+						s += alltags;
+						s += "\n";
+					}
 				}
 			}			
 		}
@@ -3136,13 +3172,21 @@
 		s += "opusenc";
 
 		//tags
-		s += (mf.TrackName.length > 0) ? " --title \"${tagTitle}\"" : "";
-		s += (mf.TrackNumber.length > 0) ? " --comment=\"track=${tagTrackNum}\"" : "";
-		s += (mf.Artist.length > 0) ? " --artist \"${tagArtist}\"" : "";
-		s += (mf.Album.length > 0) ? " --comment=\"album=${tagAlbum}\"" : "";
-		s += (mf.Genre.length > 0) ? " --comment=\"genre=${tagGenre}\"" : "";
-		s += (mf.RecordedDate.length > 0) ? " --comment=\"year=${tagYear}\"" : "";
-		s += (mf.Comment.length > 0) ? " --comment=\"comment=${tagComment}\"" : "";
+		bool copy_tags = true;
+		if (settings.has_member("tags")){
+			Json.Object tags = (Json.Object) settings.get_object_member("tags");
+			copy_tags = tags.get_boolean_member("copyTags");
+		}
+
+		if (copy_tags){
+			s += (mf.TrackName.length > 0) ? " --title \"${tagTitle}\"" : "";
+			s += (mf.TrackNumber.length > 0) ? " --comment=\"track=${tagTrackNum}\"" : "";
+			s += (mf.Artist.length > 0) ? " --artist \"${tagArtist}\"" : "";
+			s += (mf.Album.length > 0) ? " --comment=\"album=${tagAlbum}\"" : "";
+			s += (mf.Genre.length > 0) ? " --comment=\"genre=${tagGenre}\"" : "";
+			s += (mf.RecordedDate.length > 0) ? " --comment=\"year=${tagYear}\"" : "";
+			s += (mf.Comment.length > 0) ? " --comment=\"comment=${tagComment}\"" : "";
+		}
 
 		//options
 		s += " --bitrate " + audio.get_string_member("bitrate");
@@ -3209,13 +3253,21 @@
 		}
 
 		//tags
-		s += (mf.TrackName.length > 0) ? " --title \"${tagTitle}\"" : "";
-		s += (mf.TrackNumber.length > 0) ? " --comment=\"track=${tagTrackNum}\"" : "";
-		s += (mf.Artist.length > 0) ? " --artist \"${tagArtist}\"" : "";
-		s += (mf.Album.length > 0) ? " --album \"${tagAlbum}\"" : "";
-		s += (mf.Genre.length > 0) ? " --genre \"${tagGenre}\"" : "";
-		s += (mf.RecordedDate.length > 0) ? " --date \"${tagYear}\"" : "";
-		s += (mf.Comment.length > 0) ? " --comment='comment=${tagComment}'" : "";
+		bool copy_tags = true;
+		if (settings.has_member("tags")){
+			Json.Object tags = (Json.Object) settings.get_object_member("tags");
+			copy_tags = tags.get_boolean_member("copyTags");
+		}
+
+		if (copy_tags){
+			s += (mf.TrackName.length > 0) ? " --title \"${tagTitle}\"" : "";
+			s += (mf.TrackNumber.length > 0) ? " --comment=\"track=${tagTrackNum}\"" : "";
+			s += (mf.Artist.length > 0) ? " --artist \"${tagArtist}\"" : "";
+			s += (mf.Album.length > 0) ? " --album \"${tagAlbum}\"" : "";
+			s += (mf.Genre.length > 0) ? " --genre \"${tagGenre}\"" : "";

selene_16.5.0~283~ubuntu16.04.1.tar.xz/src/Utility.vala -> selene_16.9~287~ubuntu16.04.1.tar.xz/src/Utility.vala Changed

Changes of Revision 14