Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 7

selene.changes Changed

selene.spec Changed

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/CropVideoBatchWindow.vala Deleted

@@ -1,291 +0,0 @@
-/*
- * CropVideoBatchWindow.vala
- *
- * Copyright 2012 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- *
- */
-
-using Gtk;
-using Gee;
-
-using TeeJee.Logging;
-using TeeJee.FileSystem;
-using TeeJee.JSON;
-using TeeJee.ProcessManagement;
-using TeeJee.GtkHelper;
-using TeeJee.Multimedia;
-using TeeJee.System;
-using TeeJee.Misc;
-
-public class CropVideoBatchWindow : Gtk.Dialog {
-	private Gtk.Box vboxMain;
-	private Gtk.TreeView tvFiles;
-	private Gtk.ScrolledWindow swFiles;
-	
-	private Gtk.TreeViewColumn colCropL;
-	private Gtk.TreeViewColumn colCropR;
-	private Gtk.TreeViewColumn colCropT;
-	private Gtk.TreeViewColumn colCropB;
-	private Gtk.TreeViewColumn colEdit;
-
-	private MediaFile SelectedFile = null;
-
-	private Gtk.Button btnOk;
-
-	public CropVideoBatchWindow(Gtk.Window parent) {
-		set_transient_for(parent);
-		set_destroy_with_parent(true);
- //set_skip_taskbar_hint(true);
-
-		window_position = WindowPosition.CENTER_ON_PARENT;
-		icon = get_app_icon(16);
-		
-		modal = true;
-		deletable = true;
-		resizable = true;
-		
-		title = "Crop Videos (Batch)";
-		
-		// get content area
-		vboxMain = get_content_area();
-		vboxMain.set_size_request(600,500);
-
-		init_ui_file_list();
-
-		// btnOk
- btnOk = (Button) add_button ("gtk-ok", Gtk.ResponseType.ACCEPT);
- btnOk.clicked.connect (btnOk_clicked);
- 
- refresh_list_view();
-
- this.destroy.connect(()=>{ parent.show(); });
-
- show_all();
-	}
-
-	private void init_ui_file_list(){
-		//tvFiles
-		tvFiles = new TreeView();
-		tvFiles.get_selection().mode = SelectionMode.MULTIPLE;
-		tvFiles.set_tooltip_text (_("Right-click for more options"));
-		tvFiles.headers_clickable = true;
-		tvFiles.activate_on_single_click = true;
-		tvFiles.rules_hint = true;
-		
-		swFiles = new ScrolledWindow(tvFiles.get_hadjustment(), tvFiles.get_vadjustment());
-		swFiles.set_shadow_type (ShadowType.ETCHED_IN);
-		swFiles.add (tvFiles);
-		swFiles.margin = 3;
-		swFiles.set_size_request (-1, 150);
-		vboxMain.pack_start (swFiles, true, true, 0);
-	
-		CellRendererText cellText;
-		CellRendererSpin cellSpin;
-
-		//colName
-		var colName = new TreeViewColumn();
-		colName.title = _("File");
-		colName.expand = true;
-		colName.resizable = true;
-		colName.clickable = true;
-		colName.min_width = 100;
-		tvFiles.append_column(colName);
-		
-		cellText = new CellRendererText();
-		cellText.xalign = (float) 0.0;
-		cellText.ellipsize = Pango.EllipsizeMode.END;
-		colName.pack_start (cellText, false);
-		colName.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
-			MediaFile mf;
-			model.get (iter, 0, out mf, -1);
-			(cell as Gtk.CellRendererText).text = mf.Name;
-		});
-
-		//colCropL
-		colCropL = new TreeViewColumn();
-		colCropL.title = _("Crop Left");
-		colCropL.fixed_width = 80;
-		tvFiles.append_column(colCropL);
-		
-		cellSpin = new CellRendererSpin();
-		//cellSpin.xalign = (float) 0.5;
-		cellSpin.editable = true;
-		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
-		cellSpin.edited.connect ((path, new_text) => {
-			colCrop_cell_edited(path, new_text, CropInputField.CROP_LEFT);
-		});
-		
-		colCropL.pack_start (cellSpin, false);
-		colCropL.set_attributes(cellSpin, "text", CropInputField.CROP_LEFT);
-
-		//colCropR
-		colCropR = new TreeViewColumn();
-		colCropR.title = _("Right");
-		colCropR.fixed_width = 80;
-		tvFiles.append_column(colCropR);
-		
-		cellSpin = new CellRendererSpin();
-		//cellSpin.xalign = (float) 0.5;
-		cellSpin.editable = true;
-		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
-		cellSpin.edited.connect ((path, new_text) => {
-			colCrop_cell_edited(path, new_text, CropInputField.CROP_RIGHT);
-		});
-		
-		colCropR.pack_start (cellSpin, false);
-		colCropR.set_attributes(cellSpin, "text", CropInputField.CROP_RIGHT);
-
-		//colCropT
-		colCropT = new TreeViewColumn();
-		colCropT.title = _("Top");
-		colCropT.fixed_width = 80;
-		tvFiles.append_column(colCropT);
-		
-		cellSpin = new CellRendererSpin();
-		//cellSpin.xalign = (float) 0.5;
-		cellSpin.editable = true;
-		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
-		cellSpin.edited.connect ((path, new_text) => {
-			colCrop_cell_edited(path, new_text, CropInputField.CROP_TOP);
-		});
-		
-		colCropT.pack_start (cellSpin, false);
-		colCropT.set_attributes(cellSpin, "text", CropInputField.CROP_TOP);
-
-		//colCropB
-		colCropB = new TreeViewColumn();
-		colCropB.title = _("Bottom");
-		colCropB.fixed_width = 80;
-		tvFiles.append_column(colCropB);
-		
-		cellSpin = new CellRendererSpin();
-		//cellSpin.xalign = (float) 0.5;
-		cellSpin.editable = true;
-		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
-		cellSpin.edited.connect ((path, new_text) => {
-			colCrop_cell_edited(path, new_text, CropInputField.CROP_BOTTOM);
-		});
-		
-		colCropB.pack_start (cellSpin, false);
-		colCropB.set_attributes(cellSpin, "text", CropInputField.CROP_BOTTOM);
-
-		//colEdit
-		var pixbuf = new Gtk.CellRendererPixbuf();
-		pixbuf.icon_name = "gtk-edit";
-		colEdit = new Gtk.TreeViewColumn();
-		colEdit.pack_start (pixbuf, false);
-		tvFiles.append_column(colEdit);
-
-		//colSpacer
-		var colSpacer = new TreeViewColumn();
-		colSpacer.expand = false;
-		colSpacer.fixed_width = 10;
-		tvFiles.append_column(colSpacer);

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/CropVideoSingleWindow.vala Deleted

@@ -1,418 +0,0 @@
-/*
- * CropVideoSingleWindow.vala
- *
- * Copyright 2012 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- *
- */
-
-using Gtk;
-using Gee;
-
-using TeeJee.Logging;
-using TeeJee.FileSystem;
-using TeeJee.JSON;
-using TeeJee.ProcessManagement;
-using TeeJee.GtkHelper;
-using TeeJee.Multimedia;
-using TeeJee.System;
-using TeeJee.Misc;
-
-public class CropVideoSingleWindow : Gtk.Window {
-	private Gtk.Box vboxMain;
-	private Gtk.DrawingArea canvas;
-	private Gtk.Scale scalePos;
-	private Gtk.ComboBox cmbZoom;
-
-	private Gtk.SpinButton spinCropL;
-	private Gtk.SpinButton spinCropR;
-	private Gtk.SpinButton spinCropT;
-	private Gtk.SpinButton spinCropB;
-	
-	private Gtk.Label lblSourceSize;
-	private Gtk.Label lblCroppedSize;
-
-	private MediaPlayer player;
-	private MediaFile mFile;
-
-	private uint tmr_init = 0;
-
-	public CropVideoSingleWindow(Gtk.Window parent, MediaFile _mFile) {
-		set_transient_for(parent);
-		set_destroy_with_parent(true);
- //set_skip_taskbar_hint(true);
-
-		window_position = WindowPosition.CENTER_ALWAYS;
-		icon = get_app_icon(16);
-		
-		modal = true;
-		deletable = true;
-		resizable = false;
-		
-		player = new MediaPlayer();
-		player.mFile = _mFile;
-		mFile = _mFile;
-		
-		title = "Crop Video";
-
-		vboxMain = new Gtk.Box(Orientation.VERTICAL,6);
-		//vboxMain = get_content_area () as Gtk.Box;
-		add(vboxMain);
-
-		init_ui_file_crop_options();
-
-		init_ui_player();
-
-		this.destroy.connect(()=>{ parent.show(); });
-		
-		show_all();
-		
-		tmr_init = Timeout.add(100, init_delayed);
-	}
-	
-	private bool init_delayed() {
-		/* any actions that need to run after window has been displayed */
-		
-		if (tmr_init > 0) {
-			Source.remove(tmr_init);
-			tmr_init = 0;
-		}
-
-		load_file();
-
-		return false;
-	}
-	
-	private void init_ui_file_crop_options(){
-		var grid = new Gtk.Grid();
-		grid.margin = 6;
-		grid.row_spacing = 3;
-		grid.column_spacing = 3;
-		vboxMain.add(grid);
-		
-		Gtk.Adjustment adj;
-		Gtk.SpinButton spin;
-		Gtk.Label label;
-
-		string tt = _("Scroll mouse wheel to adjust");
-		
-		//left
-		label = new Gtk.Label(_("Left:"));
-		label.xalign = (float) 1.0;
-		//label.margin_left = 18;
-		grid.attach(label,0,0,1,1);
-		
-		//left
-		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
-		spin = new Gtk.SpinButton (adj, 1, 0);
-		spin.xalign = (float) 0.5;
-		spin.set_tooltip_text(tt);
-		grid.attach(spin,1,0,1,1);
-		
-		spinCropL = spin;
-	
-
-		//right
-		label = new Gtk.Label(_("Right:"));
-		label.xalign = (float) 1.0;
-		//label.margin_left = 18;
-		grid.attach(label,0,1,1,1);
-		
-		//right
-		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
-		spin = new Gtk.SpinButton (adj, 1, 0);
-		spin.xalign = (float) 0.5;
-		spin.set_tooltip_text(tt);
-		grid.attach(spin,1,1,1,1);
-
-		spinCropR = spin;
-		
-
-		//top
-		label = new Gtk.Label(_("Top:"));
-		label.xalign = (float) 1.0;
-		//label.margin_left = 18;
-		grid.attach(label,2,0,1,1);
-		
-		//top
-		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
-		spin = new Gtk.SpinButton (adj, 1, 0);
-		spin.xalign = (float) 0.5;
-		spin.set_tooltip_text(tt);
-		grid.attach(spin,3,0,1,1);
-
-		spinCropT = spin;
-		
-
-		//bottom
-		label = new Gtk.Label(_("Bottom:"));
-		label.xalign = (float) 1.0;
-		//label.margin_left = 18;
-		grid.attach(label,2,1,1,1);
-		
-		//bottom
-		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
-		spin = new Gtk.SpinButton (adj, 1, 0);
-		spin.xalign = (float) 0.5;
-		spin.set_tooltip_text(tt);
-		grid.attach(spin,3,1,1,1);
-		
-		spinCropB = spin;
-
-		label = new Gtk.Label(_("Source:"));
-		label.xalign = (float) 1.0;
-		label.margin_left = 18;
-		grid.attach(label,4,0,1,1);
-
-		label = new Gtk.Label(_("Cropped:"));
-		label.xalign = (float) 1.0;
-		label.margin_left = 18;
-		grid.attach(label,4,1,1,1);
-
-		lblSourceSize = new Gtk.Label("0x0");
-		lblSourceSize.xalign = (float) 1.0;
-		grid.attach(lblSourceSize,5,0,1,1);
-
-		lblCroppedSize = new Gtk.Label("0x0");
-		lblCroppedSize.xalign = (float) 1.0;
-		grid.attach(lblCroppedSize,5,1,1,1);
-
-		var button = new Button.with_label(_("Detect Borders"));
-		button.margin_left = 18;
-		button.set_tooltip_text(_("Detect black borders in the video and set cropping parameters"));
- grid.attach(button,6,0,1,1);
-

selene_16.2.4~246~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest Changed

selene_16.2.4~246~ubuntu16.04.1.tar.xz/debian/changelog -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/debian/changelog Changed

@@ -1,20 +1,20 @@
-selene (16.2.4~246~ubuntu16.04.1) xenial; urgency=low
+selene (16.2.7~261~ubuntu16.04.1) xenial; urgency=low
 
 * Auto build.
 
- -- Tony George <teejee2008@gmail.com> Sun, 21 Feb 2016 08:17:08 +0000
+ -- Tony George <teejee2008@gmail.com> Sat, 27 Feb 2016 18:38:28 +0000
 
-selene (16.2.4) trusty; urgency=medium
+selene (16.2.7) trusty; urgency=medium
 
- * Added new window for cropping video files
+ * Added new option for trimming audio and video files
 
- * Added option to run app in background in non-admin mode
+ * Added support for using MPV as the media player backend
 
- * Added new mplayer frontend for playing media files
+ * Added option to auto-crop and reset cropping values for multiple
+ files on the batch edit window
 
- * Fixed: Output file will not be overwritten if it already exists. A
- number will be appended to the file name.
+ * Added zoom and fullscreen options to media player
 
 * Various minor changes
 
- -- Tony George <tony.george.kol@gmail.com> Sun, 21 Feb 2016 10:00:00 +0530
+ -- Tony George <tony.george.kol@gmail.com> Sat, 27 Feb 2016 14:00:00 +0530

selene_16.2.4~246~ubuntu16.04.1.tar.xz/selene.geany -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/selene.geany Changed

@@ -17,29 +17,26 @@
 long_line_column=80
 
 [files]
-current_page=21
-FILE_NAME_0=28982;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
-FILE_NAME_1=14174;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
-FILE_NAME_2=1066;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
-FILE_NAME_3=1051;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
+current_page=14
+FILE_NAME_0=2012;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
+FILE_NAME_1=959;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
+FILE_NAME_2=4619;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
+FILE_NAME_3=1687;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=8791;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
-FILE_NAME_6=1076;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FColumnSelectionDialog.vala;0;4
+FILE_NAME_5=9178;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
+FILE_NAME_6=2129;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FColumnSelectionDialog.vala;0;4
 FILE_NAME_7=1682;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderStatusWindow.vala;0;4
 FILE_NAME_8=2082;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCustomMessageDialog.vala;0;4
 FILE_NAME_9=2677;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFFmpegBuilder.vala;0;4
-FILE_NAME_10=3248;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FSimpleProgressWindow.vala;0;4
-FILE_NAME_11=764;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
-FILE_NAME_12=57497;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.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=629;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
+FILE_NAME_12=61166;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
 FILE_NAME_13=981;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
-FILE_NAME_14=309;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
-FILE_NAME_15=2941;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2FNew%20Folder%2Ftest.vala;0;4
-FILE_NAME_16=8359;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayer.vala;0;4
-FILE_NAME_17=9490;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaFile.vala;0;4
-FILE_NAME_18=7928;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCropVideoBatchWindow.vala;0;4
-FILE_NAME_19=2196;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCropVideoSingleWindow.vala;0;4
-FILE_NAME_20=21187;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik-archive-manager%2Fsrc%2FProgressWindow.vala;0;4
-FILE_NAME_21=4853;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayerWindow.vala;0;4
+FILE_NAME_14=420;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
+FILE_NAME_15=2244;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayer.vala;0;4
+FILE_NAME_16=10003;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaFile.vala;0;4
+FILE_NAME_17=4505;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayerWindow.vala;0;4
+FILE_NAME_18=1964;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FBatchEditWindow.vala;0;4
 
 [VTE]
 last_dir=/home/teejee
@@ -55,11 +52,11 @@
 NF_03_LB=Clean
 NF_03_CM=make clean
 NF_03_WD=
-EX_00_LB=_Execute
+EX_00_LB=_Execute --debug
 EX_00_CM=./selene --debug
 EX_00_WD=
-EX_01_LB=Execute (sudo)
-EX_01_CM=sudo ./selene
+EX_01_LB=Execute
+EX_01_CM=./selene
 EX_01_WD=
 ValaFT_01_LB=_Build
 ValaFT_01_CM=make all

selene_16.2.4~246~ubuntu16.04.1.tar.xz/selene.pot -> selene_16.2.7~261~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: 2016-02-21 13:40+0530\n"
+"POT-Creation-Date: 2016-02-27 23:34+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"
@@ -25,23 +25,23 @@
 "and should start with same name."
 msgstr ""
 
-#: CropVideoSingleWindow.vala:311
+#: MediaPlayerWindow.vala:1076
 msgid "100%"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:313
+#: MediaPlayerWindow.vala:1078
 msgid "200%"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:305
+#: MediaPlayerWindow.vala:1070
 msgid "25%"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:307
+#: MediaPlayerWindow.vala:1072
 msgid "50%"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:309
+#: MediaPlayerWindow.vala:1074
 msgid "75%"
 msgstr ""
 
@@ -79,7 +79,7 @@
 msgid "Adjustments:"
 msgstr ""
 
-#: AppConfigWindow.vala:149
+#: AppConfigWindow.vala:150
 msgid "Backup Directory"
 msgstr ""
 
@@ -115,7 +115,7 @@
 "These subtitles can be switched off since they are added as a separate track"
 msgstr ""
 
-#: AppConfigWindow.vala:273
+#: AppConfigWindow.vala:274
 msgid ""
 "Encoder\n"
 "Use the 'ffmpeg' encoding tool from the FFmpeg project (Recommended)\n"
@@ -144,7 +144,7 @@
 "\n"
 msgstr ""
 
-#: AppConfigWindow.vala:195
+#: AppConfigWindow.vala:196
 msgid "Main Window"
 msgstr ""
 
@@ -161,7 +161,7 @@
 msgid "Other Effects:"
 msgstr ""
 
-#: AppConfigWindow.vala:104
+#: AppConfigWindow.vala:105
 msgid "Output Directory"
 msgstr ""
 
@@ -211,26 +211,26 @@
 msgid "SOX Audio Processing:"
 msgstr ""
 
-#: AppConfigWindow.vala:272
+#: AppConfigWindow.vala:273
 msgid ""
 "avconv\n"
 "Use the 'avconv' encoding tool from the Libav project\n"
 "\n"
 msgstr ""
 
-#: MainWindow.vala:629
+#: MainWindow.vala:677
 msgid "A-Bitrate"
 msgstr ""
 
-#: MainWindow.vala:574
+#: MainWindow.vala:622
 msgid "A-Ch"
 msgstr ""
 
-#: MainWindow.vala:550
+#: MainWindow.vala:598
 msgid "A-Fmt"
 msgstr ""
 
-#: MainWindow.vala:593
+#: MainWindow.vala:641
 msgid "A-Sampling"
 msgstr ""
 
@@ -251,48 +251,48 @@
 msgid "AC3 Audio (*.ac3)"
 msgstr ""
 
-#: MainWindow.vala:248
+#: MainWindow.vala:254
 msgid "Abort"
 msgstr ""
 
-#: MainWindow.vala:306
+#: MainWindow.vala:312
 msgid "About"
 msgstr ""
 
-#: MainWindow.vala:358 MainWindow.vala:2003
+#: MainWindow.vala:364 MainWindow.vala:2029
 msgid "Add File(s)"
 msgstr ""
 
-#: MainWindow.vala:341
+#: MainWindow.vala:347
 msgid "Add File(s)..."
 msgstr ""
 
-#: MainWindow.vala:2007
+#: MainWindow.vala:2033
 msgid "Add Folder(s)"
 msgstr ""
 
-#: MainWindow.vala:351
+#: MainWindow.vala:357
 msgid "Add Folder(s)..."
 msgstr ""
 
-#: MainWindow.vala:1131
+#: MainWindow.vala:1178
 msgid "Add New Preset"
 msgstr ""
 
-#: MainWindow.vala:2416 MainWindow.vala:2442
+#: MainWindow.vala:2321 MainWindow.vala:2347 MainWindow.vala:2481
 msgid "Add some files to the file list"
 msgstr ""
 
-#: MainWindow.vala:2430
+#: MainWindow.vala:2335
 msgid "Add some videos to the file list"
 msgstr ""
 
-#: MainWindow.vala:2049
+#: MainWindow.vala:2075
 #, c-format
 msgid "Adding (%d/%d): '%s'"
 msgstr ""
 
-#: MainWindow.vala:2039
+#: MainWindow.vala:2065
 msgid "Adding..."
 msgstr ""
 
@@ -300,23 +300,27 @@
 msgid "Adjust Stereo for Headphones"
 msgstr ""
 
-#: MainWindow.vala:749
+#: MediaPlayerWindow.vala:358
+msgid "Advanced Mode"
+msgstr ""
+
+#: MainWindow.vala:797
 msgid "Album"
 msgstr ""
 
-#: Main.vala:655
+#: Main.vala:674
 msgid "All files removed"
 msgstr ""
 
-#: MainWindow.vala:2326
+#: MainWindow.vala:2391
 msgid "An audio-video converter for Linux"
 msgstr ""
 
-#: MainWindow.vala:282
+#: MainWindow.vala:288
 msgid "Application Settings"
 msgstr ""
 
-#: MainWindow.vala:737
+#: MainWindow.vala:785
 msgid "Artist"
 msgstr ""
 
@@ -359,10 +363,14 @@

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/AppConfigWindow.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/AppConfigWindow.vala Changed

@@ -46,6 +46,7 @@
 	private Button btnCancel;
 	private ComboBox cmbFileView;
 	private ComboBox cmbSelectEncoder;
+	private ComboBox cmbSelectPlayer;
 	
 	public AppConfigWindow(Gtk.Window parent) {
 		title = "Settings";
@@ -274,8 +275,8 @@
 cmbSelectEncoder.set_tooltip_markup(tt);
 		lblSelectEncoder.set_tooltip_markup(tt);
 		
-		switch(App.AVEncoder){
-		case "Encoder":
+		switch(App.PrimaryEncoder){
+		case "ffmpeg":
 			cmbSelectEncoder.active = 0;
 			break;
 		case "avconv":
@@ -285,6 +286,51 @@
 			cmbSelectEncoder.active = 0;
 			break;
 		}
+
+		//hboxPlayer -----------------------------------------------
+		
+		var hboxPlayer = new Gtk.Box(Orientation.HORIZONTAL,6);
+		vboxTabTools.pack_start (hboxPlayer, false, true, 0);
+
+		//lblSelectPlayer
+		var lblSelectPlayer = new Label ("Use Mpv or MPlayer");
+		lblSelectPlayer.set_use_markup(true);
+		lblSelectPlayer.halign = Align.START;
+		lblSelectPlayer.hexpand = true;
+		hboxPlayer.add(lblSelectPlayer);
+		
+		//cmbSelectPlayer
+		//TreeIter iter;
+		model = new Gtk.ListStore (2, typeof (string), typeof (string));
+		model.append (out iter);
+		model.set (iter, 0, _("mpv"), 1, "mpv");
+		model.append (out iter);
+		model.set (iter, 0, _("mplayer"), 1, "mplayer");
+
+		cmbSelectPlayer = new ComboBox.with_model(model);
+		hboxPlayer.add(cmbSelectPlayer);
+		sizegroup.add_widget(cmbSelectPlayer);
+		
+		textCell = new CellRendererText();
+ cmbSelectPlayer.pack_start( textCell, false );
+ cmbSelectPlayer.set_attributes( textCell, "text", 0 );
+			
+ //string tt = _("avconv\nUse the 'avconv' encoding tool from the Libav project\n\n");
+ //tt += _("Player\nUse the 'ffmpeg' encoding tool from the FFmpeg project (Recommended)\n\n");
+ //cmbSelectPlayer.set_tooltip_markup(tt);
+		//lblSelectPlayer.set_tooltip_markup(tt);
+		
+		switch(App.PrimaryPlayer){
+		case "mpv":
+			cmbSelectPlayer.active = 0;
+			break;
+		case "mplayer":
+			cmbSelectPlayer.active = 1;
+			break;
+		default:
+			cmbSelectPlayer.active = 0;
+			break;
+		}
 	}
 	
 	private void chkOutput_clicked(){
@@ -322,8 +368,9 @@
 
 		App.TileView = (cmbFileView.active == 1);
 
-		App.AVEncoder = gtk_combobox_get_value(cmbSelectEncoder,1,"ffmpeg");
-
+		App.PrimaryEncoder = gtk_combobox_get_value(cmbSelectEncoder,1,"ffmpeg");
+		App.PrimaryPlayer = gtk_combobox_get_value(cmbSelectPlayer,1,"mpv");
+		
 		// Save settings
 		App.save_config();

selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/BatchEditWindow.vala Added

@@ -0,0 +1,501 @@
+/*
+ * CropVideoBatchWindow.vala
+ *
+ * Copyright 2012 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ *
+ */
+
+using Gtk;
+using Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class BatchEditWindow : Gtk.Dialog {
+	private Gtk.Box vboxMain;
+	private Gtk.TreeView tvFiles;
+	private Gtk.ScrolledWindow swFiles;
+	
+	private Gtk.TreeViewColumn colCropL;
+	private Gtk.TreeViewColumn colCropR;
+	private Gtk.TreeViewColumn colCropT;
+	private Gtk.TreeViewColumn colCropB;
+	private Gtk.TreeViewColumn colStartPos;
+	private Gtk.TreeViewColumn colEndPos;
+	private Gtk.TreeViewColumn colEdit;
+
+	private MediaFile SelectedFile = null;
+
+	private Gtk.Button btnCropAuto;
+	private Gtk.Button btnCropReset;
+	private Gtk.Button btnOk;
+
+	private string action = "";
+	private bool crop_detect_is_running = false;
+	
+	public static Gtk.Window CropVideos(Gtk.Window parent){
+		var win = new BatchEditWindow(parent, "crop");
+		parent.hide();
+		return win;
+	}
+
+	public static Gtk.Window TrimFiles(Gtk.Window parent){
+		var win = new BatchEditWindow(parent, "trim");
+		parent.hide();
+		return win;
+	}
+	
+	public BatchEditWindow(Gtk.Window? parent, string _action) {
+		set_transient_for(parent);
+		set_destroy_with_parent(true);
+ //set_skip_taskbar_hint(true);
+
+		window_position = WindowPosition.CENTER_ON_PARENT;
+		icon = get_app_icon(16);
+		
+		modal = true;
+		deletable = true;
+		resizable = true;
+
+		action = _action;
+
+		if (action == "crop"){
+			title = "Crop Videos (Batch)";
+		}
+		else if (action == "trim"){
+			title = "Trim Duration (Batch)";
+		}
+		
+		// get content area
+		vboxMain = get_content_area();
+		vboxMain.set_size_request(600,500);
+
+		init_ui_file_list();
+
+		if (action == "crop"){
+			// btnCropAuto
+			btnCropAuto = (Button) add_button ("Auto Crop", Gtk.ResponseType.NONE);
+			btnCropAuto.clicked.connect(btnCropAuto_clicked);
+
+			// btnCropReset
+			btnCropReset = (Button) add_button ("Reset", Gtk.ResponseType.NONE);
+			btnCropReset.clicked.connect (btnCropReset_clicked);
+		}
+		
+		// btnOk
+ btnOk = (Button) add_button ("gtk-ok", Gtk.ResponseType.ACCEPT);
+ btnOk.clicked.connect (btnOk_clicked);
+ 
+ refresh_list_view();
+
+ this.destroy.connect(()=>{ parent.show(); });
+
+ show_all();
+	}
+
+	private void init_ui_file_list(){
+		//tvFiles
+		tvFiles = new TreeView();
+		tvFiles.get_selection().mode = SelectionMode.MULTIPLE;
+		//tvFiles.set_tooltip_text (_("Right-click for more options"));
+		tvFiles.headers_clickable = true;
+		tvFiles.activate_on_single_click = true;
+		tvFiles.rules_hint = true;
+		
+		swFiles = new ScrolledWindow(tvFiles.get_hadjustment(), tvFiles.get_vadjustment());
+		swFiles.set_shadow_type (ShadowType.ETCHED_IN);
+		swFiles.add (tvFiles);
+		swFiles.margin = 3;
+		swFiles.set_size_request (-1, 150);
+		vboxMain.pack_start (swFiles, true, true, 0);
+	
+		CellRendererText cellText;
+		CellRendererSpin cellSpin;
+
+		//colName
+		var colName = new TreeViewColumn();
+		colName.title = _("File");
+		colName.expand = true;
+		colName.resizable = true;
+		colName.clickable = true;
+		colName.min_width = 100;
+		tvFiles.append_column(colName);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 0.0;
+		cellText.ellipsize = Pango.EllipsizeMode.END;
+		colName.pack_start (cellText, false);
+		colName.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			model.get (iter, 0, out mf, -1);
+			(cell as Gtk.CellRendererText).text = mf.Name;
+		});
+
+		
+		//colCropL
+		colCropL = new TreeViewColumn();
+		colCropL.title = _("Crop Left");
+		colCropL.fixed_width = 80;
+		tvFiles.append_column(colCropL);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, TreeColumn.CROP_LEFT);
+		});
+		
+		colCropL.pack_start (cellSpin, false);
+		colCropL.set_attributes(cellSpin, "text", TreeColumn.CROP_LEFT);
+
+		//colCropR
+		colCropR = new TreeViewColumn();
+		colCropR.title = _("Right");
+		colCropR.fixed_width = 80;
+		tvFiles.append_column(colCropR);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, TreeColumn.CROP_RIGHT);
+		});
+		
+		colCropR.pack_start (cellSpin, false);
+		colCropR.set_attributes(cellSpin, "text", TreeColumn.CROP_RIGHT);
+
+		//colCropT
+		colCropT = new TreeViewColumn();
+		colCropT.title = _("Top");
+		colCropT.fixed_width = 80;
+		tvFiles.append_column(colCropT);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/ColumnSelectionDialog.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/ColumnSelectionDialog.vala Changed

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/FileInfoWindow.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/FileInfoWindow.vala Changed

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/Main.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/Main.vala Changed

@@ -38,7 +38,7 @@
 public Main App;
 public const string AppName = "Selene Media Converter";
 public const string AppShortName = "selene";
-public const string AppVersion = "16.2.4";
+public const string AppVersion = "16.2.7";
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "teejeetech@gmail.com";
 
@@ -86,7 +86,8 @@
 	public string InputDirectory = "";
 	public bool TileView = true;
 	
-	public string AVEncoder = "ffmpeg";
+	public string PrimaryEncoder = "ffmpeg";
+	public string PrimaryPlayer = "mpv";
 
 	public string ListViewColumns = "";
 	
@@ -310,7 +311,6 @@
 		InputFiles = new Gee.ArrayList<MediaFile>();
 		Encoders = new Gee.HashMap<string,Encoder>();
 
-		log_msg("here");
 		//check encoders
 		init_encoder_list();
 		check_all_encoders();
@@ -446,7 +446,7 @@
 		//Encoders["avplay"] = new Encoder("avplay","Libav's Audio Video Player","Audio-Video Playback");
 		Encoders["mplayer"] = new Encoder("mplayer","Media Player","Audio-Video Playback");
 		//Encoders["mplayer2"] = new Encoder("mplayer2","Media Player","Audio-Video Playback");
-		//Encoders["mpv"] = new Encoder("mpv","Media Player","Audio-Video Playback");
+		Encoders["mpv"] = new Encoder("mpv","Media Player","Audio-Video Playback");
 		//Encoders["smplayer"] = new Encoder("smplayer","Media Player","Audio-Video Playback");
 		//Encoders["vlc"] = new Encoder("vlc","Media Player","Audio-Video Playback");
 	}
@@ -458,7 +458,7 @@
 	}
 
 	public void check_ffmpeg_codec_support(){
-		FFmpegCodecs = FFmpegCodec.check_codec_support(AVEncoder);
+		FFmpegCodecs = FFmpegCodec.check_codec_support(PrimaryEncoder);
 	}
 	
 	public void start_input_thread(){
@@ -519,7 +519,8 @@
 		config.set_string_member("output-dir", OutputDirectory);
 		config.set_string_member("last-script", SelectedScript.Path);
 		config.set_string_member("tile-view", TileView.to_string());
-		config.set_string_member("av-encoder", AVEncoder);
+		config.set_string_member("av-encoder", PrimaryEncoder);
+		config.set_string_member("av-player", PrimaryPlayer);
 		config.set_string_member("list-view-columns", ListViewColumns);
 		
 		if (SelectedScript != null) {
@@ -573,9 +574,11 @@
 		else
 			OutputDirectory = "";
 
-		AVEncoder = json_get_string(config,"av-encoder", "ffmpeg");
+		PrimaryEncoder = json_get_string(config,"av-encoder", "ffmpeg");
+		PrimaryPlayer = json_get_string(config,"av-player", "mpv");
 
 		check_and_default_av_encoder();
+		check_and_default_av_player();
 
 		val = json_get_string(config,"last-script", "");
 		if (val != null && val.length > 0) {
@@ -588,28 +591,44 @@
 	}
 
 	public void check_and_default_av_encoder(){
-		if (Encoders.has_key(AVEncoder) && Encoders[AVEncoder].IsAvailable){
+		if (Encoders.has_key(PrimaryEncoder) && Encoders[PrimaryEncoder].IsAvailable){
 			return;
 		}
 		
 		if (Encoders["ffmpeg"].IsAvailable){
-			AVEncoder = "ffmpeg";
+			PrimaryEncoder = "ffmpeg";
 			return;
 		}
 
 		if (Encoders["avconv"].IsAvailable){
-			AVEncoder = "avconv";
+			PrimaryEncoder = "avconv";
 			return;
 		}
 	}
 
+	public void check_and_default_av_player(){
+		if (Encoders.has_key(PrimaryPlayer) && Encoders[PrimaryPlayer].IsAvailable){
+			return;
+		}
+		
+		if (Encoders["mpv"].IsAvailable){
+			PrimaryPlayer = "mpv";
+			return;
+		}
+
+		if (Encoders["mplayer"].IsAvailable){
+			PrimaryPlayer = "mplayer";
+			return;
+		}
+	}
+	
 	public void exit_app(){
 		save_config();
 		Gtk.main_quit();
 	}
 
 	public bool add_file (string filePath){
-		MediaFile mFile = new MediaFile (filePath, App.AVEncoder);
+		MediaFile mFile = new MediaFile (filePath, App.PrimaryEncoder);
 
 		if (mFile.IsValid
 			&& mFile.Extension != ".srt"
@@ -868,20 +887,20 @@
 				var fileScript = File.parse_name (SelectedScript.Path);
 				var dis = new DataInputStream (fileScript.read());
 
-				MatchInfo match;
+				/*MatchInfo match;
 				Regex rxCrop_libav = new Regex ("""(avconv|ffmpeg).*-vf.*(crop=[^, ]+)""");
 				Regex rxCrop_x264 = new Regex ("""x264.*(--vf|--video-filter).*(crop:[^/ ]+)""");
 				Regex rxCrop_f2t = new Regex ("""ffmpeg2theora.*""");
 				Regex rxCrop_f2t_left = new Regex ("""ffmpeg2theora.*(--cropleft [0-9]+) """);
 				Regex rxCrop_f2t_right = new Regex ("""ffmpeg2theora.*(--cropright [0-9]+) """);
 				Regex rxCrop_f2t_top = new Regex ("""ffmpeg2theora.*(--croptop [0-9]+) """);
-				Regex rxCrop_f2t_bottom = new Regex ("""ffmpeg2theora.*(--cropbottom [0-9]+) """);
+				Regex rxCrop_f2t_bottom = new Regex ("""ffmpeg2theora.*(--cropbottom [0-9]+) """);*/
 
 				string line = dis.read_line (null);
 				while (line != null) {
-					line = line.replace ("${audiodec}", "%s -i \"${inFile}\" -f wav -acodec pcm_s16le -vn -y -".printf(AVEncoder));
+					line = line.replace ("${audiodec}", "%s -i \"${inFile}\" -f wav -acodec pcm_s16le -vn -y -".printf(PrimaryEncoder));
 
-					if (mf.crop_enabled()){
+					/*if (mf.crop_enabled()){
 						if (rxCrop_libav.match (line, 0, out match)){
 							line = line.replace (match.fetch(2), "crop=" + mf.crop_values_libav());
 						}
@@ -903,6 +922,7 @@
 							}
 						}
 					}
+					* */
 
 					script.append (line + "\n");
 					line = dis.read_line (null);
@@ -1365,7 +1385,7 @@
 					case "vp8":
 					case "vp9":
 						s += encode_video_avconv(mf,settings);
-						encoderList.add(AVEncoder);
+						encoderList.add(PrimaryEncoder);
 						break;
 				}
 
@@ -1388,7 +1408,7 @@
 							break;
 						case "aac":
 							s += encode_audio_avconv(mf,settings);
-							encoderList.add(AVEncoder);
+							encoderList.add(PrimaryEncoder);
 							if (audio.get_boolean_member("soxEnabled")){
 								encoderList.add("sox");
 							};
@@ -1416,7 +1436,7 @@
 						switch (vcodec){
 							case "x265":
 								s += mux_avconv(mf,settings);
-								encoderList.add(AVEncoder);
+								encoderList.add(PrimaryEncoder);
 								break;
 							default:
 								s += mux_mkvmerge(mf,settings);
@@ -1432,7 +1452,7 @@
 						switch (vcodec){
 							case "x265":
 								s += mux_avconv(mf,settings);
-								encoderList.add(AVEncoder);
+								encoderList.add(PrimaryEncoder);
 								break;
 							default:
 								s += mux_mp4box(mf,settings);
@@ -1468,7 +1488,7 @@
 					
 				case "aac":
 					s += encode_audio_avconv(mf,settings);
-					encoderList.add(AVEncoder);
+					encoderList.add(PrimaryEncoder);
 					if (audio.get_boolean_member("soxEnabled")){
 						encoderList.add("sox");
 					};
@@ -1504,7 +1524,7 @@
 			case "flac":
 			case "wav":
 				s += encode_audio_avconv(mf,settings);
-				encoderList.add(AVEncoder);

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MainWindow.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/MainWindow.vala Changed

@@ -45,7 +45,10 @@
     private ToolButton btnAbout;
     private ToolButton btnDonate;
     private ToolButton btnOpenOutputFolder;
-    private ToolButton btnCrop;
+
+    private MenuToolButton btnEditFiles;
+    private Gtk.Menu menuEditFiles;
+
     private ToolButton btnStart;
     private ToolButton btnStop;
     private ToolButton btnFinish;
@@ -77,6 +80,7 @@
 	private ImageMenuItem miFileInfoOutput;
 	private ImageMenuItem miFileSkip;
 	private Gtk.MenuItem miFileCropAuto;
+	private Gtk.MenuItem miFileTrim;
 	private Gtk.MenuItem miFileRemove;
 	private Gtk.MenuItem miFilePlaySource;
 	private Gtk.MenuItem miFilePlayOutput;
@@ -216,13 +220,15 @@
 		separator1 = new Gtk.SeparatorToolItem();
 		toolbar.add(separator1);
 
-		//btnCrop
+		init_ui_main_toolbar_edit();
+		
+		/*//btnCrop
 		btnCrop = new Gtk.ToolButton.from_stock ("gtk-edit");
 		btnCrop.is_important = true;
 		btnCrop.label = _("Crop");
 		btnCrop.clicked.connect (crop_videos);
 		btnCrop.set_tooltip_text (_("Crop Videos"));
-		toolbar.add (btnCrop);
+		toolbar.add (btnCrop);*/
 		
 		//btnStart
 		btnStart = new Gtk.ToolButton.from_stock ("gtk-media-play");
@@ -337,7 +343,7 @@
 		menuAddFiles.append(miAddFile);
 
 		var box = new Gtk.Box(Orientation.HORIZONTAL,6);
-		box.add(get_shared_icon("gtk-file","",32));
+		box.add(get_shared_icon("gtk-file","",24));
 		box.add(new Gtk.Label(_("Add File(s)...")));
 		miAddFile.add(box);
 		
@@ -347,7 +353,7 @@
 		menuAddFiles.append(miAddFolder);
 
 		box = new Gtk.Box(Orientation.HORIZONTAL,6);
-		box.add(get_shared_icon("gtk-directory","",32));
+		box.add(get_shared_icon("gtk-directory","",24));
 		box.add(new Gtk.Label(_("Add Folder(s)...")));
 		miAddFolder.add(box);
 
@@ -377,7 +383,7 @@
 		menuRemoveFiles.append(miRemoveFiles);
 
 		var box = new Gtk.Box(Orientation.HORIZONTAL,6);
-		box.add(get_shared_icon("gtk-remove","",32));
+		box.add(get_shared_icon("gtk-remove","",24));
 		box.add(new Gtk.Label(_("Remove Selected Items")));
 		
 		miRemoveFiles.add(box);
@@ -389,7 +395,7 @@
 		menuRemoveFiles.append(miClearList);
 
 		box = new Gtk.Box(Orientation.HORIZONTAL,6);
-		box.add(get_shared_icon("gtk-clear","",32));
+		box.add(get_shared_icon("gtk-clear","",24));
 		box.add(new Gtk.Label(_("Clear List")));
 		miClearList.add(box);
 
@@ -408,6 +414,48 @@
 		menuRemoveFiles.show_all();
 	}
 
+	private void init_ui_main_toolbar_edit(){
+		// menuEditFiles
+		menuEditFiles = new Gtk.Menu();
+
+		// miCropVideos
+		var miCropVideos = new Gtk.MenuItem();
+		//miCropVideos.set_reserve_indicator(false);
+		miCropVideos.activate.connect (() => { btnCropVideos_clicked(); });
+		menuEditFiles.append(miCropVideos);
+
+		var box = new Gtk.Box(Orientation.HORIZONTAL,6);
+		//box.add(get_shared_icon("gtk-edit","",32));
+		box.add(new Gtk.Label(_("Crop Videos")));
+		miCropVideos.add(box);
+
+		// miTrimDuration
+		var miTrimDuration = new Gtk.MenuItem();
+		miTrimDuration.set_reserve_indicator(false);
+		miTrimDuration.activate.connect (() => { btnTrimDuration_clicked(); });
+		menuEditFiles.append(miTrimDuration);
+
+		box = new Gtk.Box(Orientation.HORIZONTAL,6);
+		//box.add(get_shared_icon("gtk-edit","",32));
+		box.add(new Gtk.Label(_("Trim Duration")));
+		miTrimDuration.add(box);
+
+		//btnEditFiles
+		btnEditFiles = new Gtk.MenuToolButton.from_stock ("gtk-edit");
+		btnEditFiles.label = _("Crop");
+		btnEditFiles.set_menu(menuEditFiles);
+		btnEditFiles.is_important = true;
+		btnEditFiles.set_tooltip_text (_("Crop Videos"));
+		toolbar.add (btnEditFiles);
+
+		btnEditFiles.clicked.connect(()=>{
+			//menuEditFiles.popup (null, null, null, 0, Gtk.get_current_event_time());
+			btnCropVideos_clicked();
+		});
+		
+		menuEditFiles.show_all();
+	}
+
 	// file list -------------------------------------
 
 	private void init_list_view(){
@@ -421,7 +469,7 @@
 		swFiles = new ScrolledWindow(tvFiles.get_hadjustment(), tvFiles.get_vadjustment());
 		swFiles.set_shadow_type (ShadowType.ETCHED_IN);
 		swFiles.add (tvFiles);
-		//swFiles.margin = 6;
+		swFiles.margin = 3;
 		swFiles.set_size_request (-1, 300);
 		vboxMain.pack_start (swFiles, true, true, 0);
 	
@@ -818,20 +866,6 @@
 		colRecordedDate.pack_start (cellText, false);
 		colRecordedDate.set_attributes(cellText, "text", InputField.FILE_RECORDED_DATE);
 		
-		/*
-		//colCrop
-		colCrop = new TreeViewColumn();
-		colCrop.title = _("CropVideo (L:T:R:B)");
-		colCrop.fixed_width = 100;
-		//tvFiles.append_column(colCrop);
-		
-		cellText = new CellRendererText();
-		cellText.editable = true;
-		cellText.edited.connect (tvFiles_crop_cell_edited);
-		colCrop.pack_start (cellText, false);
-		colCrop.set_attributes(cellText, "text", InputField.FILE_CROPVAL);
-		*/
-		
 		//colProgress
 		colProgress = new TreeViewColumn();
 		colProgress.title = _("Status");
@@ -883,17 +917,30 @@
 		miFileCropAuto.activate.connect(miFileCropAuto_clicked);
 		menuFile.append(miFileCropAuto);
 
+		// miFileTrim
+		miFileTrim = new Gtk.MenuItem.with_label (_("Trim Duration..."));
+		miFileTrim.activate.connect(miFileTrim_clicked);
+		menuFile.append(miFileTrim);
+
 		// miFileSeparator0
 		var miFileSeparator0 = new Gtk.MenuItem();
 		miFileSeparator0.override_color (StateFlags.NORMAL, gray);
 		menuFile.append(miFileSeparator0);
-		
+
 		miFileCropAuto.show.connect(()=>{
-			miFileSeparator0.visible = miFileCropAuto.visible;
+			miFileSeparator0.visible = (miFileCropAuto.visible || miFileTrim.visible);
 		});
 
 		miFileCropAuto.hide.connect(()=>{
-			miFileSeparator0.visible = miFileCropAuto.visible;
+			miFileSeparator0.visible = (miFileCropAuto.visible || miFileTrim.visible);
+		});
+
+		miFileTrim.show.connect(()=>{
+			miFileSeparator0.visible = (miFileCropAuto.visible || miFileTrim.visible);
+		});
+
+		miFileTrim.hide.connect(()=>{
+			miFileSeparator0.visible = (miFileCropAuto.visible || miFileTrim.visible);
 		});
 		
 		// miFileRemove
@@ -1712,6 +1759,7 @@
 				miFilePlaySource.visible = true;
 				miFilePlayOutput.visible = false;
 				miFileCropAuto.visible = true;
+				miFileTrim.visible = true;
 				miFileRemove.visible = true;
 				miFileSeparator1.visible = true;
 				miFileSeparator2.visible = false;
@@ -1761,6 +1809,7 @@
 				miFilePlaySource.visible = false;
 				miFilePlayOutput.visible = false;
 				miFileCropAuto.visible = false;
+				miFileTrim.visible = false;

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaFile.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/MediaFile.vala Changed

@@ -30,14 +30,18 @@
 	public string RecordedDate = "";
 	public string Comment = "";
 
-	public int CropW = 0;
-	public int CropH = 0;
+	//public int CropW = 0;
+	//public int CropH = 0;
 	public int CropL = 0;
 	public int CropR = 0;
 	public int CropT = 0;
 	public int CropB = 0;
 	public bool AutoCropError = false;
 
+	public double StartPos = 0.0;
+	public double EndPos = 0.0;
+	public Gee.ArrayList<MediaClip> clip_list;
+	
 	//public int Status = 0;
 	public FileStatus Status = FileStatus.PENDING;
 	public bool IsValid;
@@ -69,13 +73,15 @@
 	public string OutputFilePath = "";
 	public long OutputFrameCount = 0;
 
-	public static int ThumbnailWidth = 80;
+	public static int ThumbnailWidth = 80; 
 	public static int ThumbnailHeight= 64;
 			
 	public MediaFile(string filePath, string av_encoder){
 		IsValid = false;
 		if (file_exists (filePath) == false) { return; }
 
+		clip_list = new Gee.ArrayList<MediaClip>();
+		
 		// set file properties ------------
 
 		File f = File.new_for_path (filePath);
@@ -297,6 +303,8 @@
 		string params = get_file_crop_params (Path);
 		string[] arr = params.split (":");
 
+		int CropW = 0;
+		int CropH = 0;
 		if (arr.length == 4){
 			CropW = int.parse (arr[0]);
 			CropH = int.parse (arr[1]);
@@ -316,15 +324,13 @@
 	}
 
 	public bool crop_enabled(){
-		if ((CropW == 0)&&(CropH == 0)&&(CropL == 0)&&(CropT == 0))
+		if ((CropL == 0) && (CropR == 0) && (CropT == 0) && (CropB == 0))
 			return false;
 		else
 			return true;
 	}
 
 	public void crop_reset(){
-		CropW = 0;
-		CropH = 0;
 		CropL = 0;
 		CropT = 0;
 		CropR = 0;
@@ -341,10 +347,16 @@
 	}
 
 	public string crop_values_libav(){
-		if (crop_enabled())
-			return "%i:%i:%i:%i".printf(CropW,CropH,CropL,CropT);
-		else
+		if (crop_enabled()){
+			int w = SourceWidth - CropL - CropR;
+			int h = SourceHeight - CropT - CropB;
+			int x = CropL;
+			int y = CropT;
+			return "%i:%i:%i:%i".printf(w,h,x,y);
+		}
+		else{
 			return "iw:ih:0:0";
+		}
 	}
 
 	public string crop_values_x264(){
@@ -354,14 +366,11 @@
 			return "0,0,0,0";
 	}
 
-	public void preview_output(string av_player){
-		//deprecated
-	}
-
 	public void play_source(string av_player){
 		play_file(Path, av_player);
 	}
 
+	//TODO: Remove
 	private void play_file(string file_path, string av_player){
 		if (file_exists(file_path)){
 			
@@ -387,5 +396,13 @@
 			}
 		}
 	}
-	
+}
+
+public class MediaClip : GLib.Object{
+	public double StartPos = 0.0;
+	public double EndPos = 0.0;
+
+	public double Duration(){
+		return (EndPos - StartPos);
+	}
 }

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaPlayer.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/MediaPlayer.vala Changed

@@ -23,6 +23,7 @@
     public bool PauseOnLoad = false;
 
 	public uint WindowID = 0;
+	//public string input_pipe = "";
 	
     public string err_line;
 	public string out_line;
@@ -37,7 +38,7 @@
 	public int64 progress_count;
 	public int64 progress_total;
 	public bool is_running;
-
+	
 	public int CropL = 0;
 	public int CropR = 0;
 	public int CropT = 0;
@@ -48,7 +49,7 @@
 	private Regex rex_av;
 	private Regex rex_audio;
 	private Regex rex_video;
-	
+	private Regex rex_mpv;
 
 	public MediaPlayer(){
         IsMuted = false;
@@ -71,34 +72,82 @@
 			
 			//A:   1.9 V:   1.9 A-V:  0.001 ct:  0.000   0/  0  1%  1%  0.4% 0 0
 			rex_audio = new Regex("""^A:[ \t]*([0-9.]+)[ \t]*""");
-			
+
+			//1.793458 no no 50
+			rex_mpv = new Regex("""([0-9.]*) (yes|no) (yes|no) ([0-9.])""");
 		}
 		catch (Error e) {
 			log_error (e.message);
 		}
 	}
 
-	public void StartPlayerWithRectangle(){
+	public void StartPlayerWithCropFilter(){
 		if (mFile != null){
 			int x = mFile.CropL;
 			int y = mFile.CropT;
 			int w = mFile.SourceWidth - mFile.CropL - mFile.CropR;
 			int h = mFile.SourceHeight - mFile.CropT - mFile.CropB;
-			StartPlayer("-vf rectangle=%d:%d:%d:%d".printf(w,h,x,y));
+
+			if (App.PrimaryPlayer == "mpv"){
+				StartPlayer(" --vf=crop=%d:%d:%d:%d".printf(w,h,x,y));
+			}
+			else{
+				StartPlayer(" -vf rectangle=%d:%d:%d:%d".printf(w,h,x,y));
+			}
 		}
 		else{
-			StartPlayer("-vf rectangle");
+			if (App.PrimaryPlayer == "mplayer"){
+				StartPlayer("-vf rectangle"); //mplayer
+			}
 		}
 	}
 
 	public void StartPlayerWithCropDetect(){
-		StartPlayer("-vf cropdetect");
+		if (App.PrimaryPlayer == "mplayer"){
+			StartPlayer("-vf cropdetect");
+		}
+		else{
+			//StartPlayer("--vf=lavfi=cropdetect");
+		}
+	}
+
+	public void Mpv_Add_CropDetectFilter(){
+		if (App.PrimaryPlayer == "mpv"){
+			write_to_stdin("vf add \"lavfi=cropdetect\"");
+		}
 	}
+
+	
+	public void Mpv_Remove_CropDetectFilter(){
+		if (App.PrimaryPlayer == "mpv"){
+			write_to_stdin("vf del \"lavfi=cropdetect\"");
+		}
+	}
+
 	
 	public void StartPlayer(string ExtraOptions = ""){
-		string args = "mplayer";
-        args += " -slave -identify -idle -noquiet -osdlevel 0 -colorkey 0x101010 -msglevel all=6 -nofs";
-        args += " -wid %u".printf(WindowID);
+		string args = App.PrimaryPlayer;
+		
+		if (App.PrimaryPlayer == "mpv"){
+			
+			//options
+			args += " --no-config --no-quiet --idle=yes --keep-open=yes --terminal --no-msg-color --input-file=/dev/stdin --no-fs --hwdec=no --sub-auto=fuzzy --vo=xv --ao=alsa --stop-screensaver --no-input-default-bindings --input-x11-keyboard=no --no-input-cursor --cursor-autohide=no --no-keepaspect --monitorpixelaspect=1 --osd-scale=1 --osd-level=0 --screenshot-format=jpg --ytdl=no";
+
+			//status line format
+			args += " --term-status-msg='${=time-pos} ${pause} ${mute} ${volume}'";
+			
+			//window id
+			args += " --wid=%u".printf(WindowID);
+		}
+		else if (App.PrimaryPlayer == "mplayer"){
+
+			//options
+			args += " -slave -noquiet -msglevel all=6 -nofs -idle -osdlevel 0 -colorkey 0x101010";
+			
+			//widowid
+			args += " -wid %u".printf(WindowID);
+		}
+
 		if (ExtraOptions.length > 0){
 			args += " " + ExtraOptions.strip();
 		}
@@ -175,8 +224,13 @@
 			
 			err_line = dis_err.read_line (null);
 			while (is_running && (err_line != null)) {
-				
-				if (rex_av.match(err_line, 0, out match)){
+				if (rex_mpv.match(err_line, 0, out match)){
+					Position = double.parse(match.fetch(1));
+					IsPaused = (match.fetch(2) == "yes") ? true : false;
+					IsMuted = (match.fetch(3) == "yes") ? true : false;
+					Volume = int.parse(match.fetch(4));
+				}
+				else if (rex_av.match(err_line, 0, out match)){
 					Position = double.parse(match.fetch(2));
 					IsPaused = false;
 					//log_debug("Pos=%.2f".printf(Position));
@@ -197,6 +251,8 @@
 				//log_debug("err:" + err_line);
 				err_line = dis_err.read_line (null); //read next
 			}
+
+			log_debug("stderr reader exited");
 		}
 		catch (Error e) {
 			log_debug("In read_error_line()");
@@ -238,11 +294,14 @@
 					}
 				}
 
-				//  log_debug("out:" + out_line);
+				log_debug("out:" + out_line);
 				out_line = dis_out.read_line (null);  //read next
 			}
 
-			is_running = false;
+			//is_running = false;
+
+			//input_pipe = "";
+			log_debug("stdout reader exited");
 		}
 		catch (Error e) {
 			log_debug("In read_output_line()");
@@ -266,8 +325,18 @@
 
 	public void Open(MediaFile _mFile, bool pause, bool mute, bool loop){
 		mFile = _mFile;
-		
-		write_to_stdin("loadfile '%s'".printf(mFile.Path.replace("'","\\'")));
+
+		string f = mFile.Path;
+		//escape: \ \n "
+        f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n");
+        f = "\"" + f + "\"";
+        
+		if (App.PrimaryPlayer == "mpv"){
+			write_to_stdin("loadfile %s".printf(f));
+		}
+		else{
+			write_to_stdin("loadfile %s".printf(f));
+		}
 		
 		if (pause){
 			FrameStep(); //'frame_step' will pause the video, 'pause' will toggle
@@ -281,7 +350,12 @@
 	}
 
 	public void Loop(){
-		write_to_stdin("loop 100 ");
+		if (App.PrimaryPlayer == "mpv"){
+			write_to_stdin("cycle loop 100 ");
+		}
+		else{
+			write_to_stdin("loop 100 ");
+		}
 	}
 
 	public void Pause(){
@@ -296,22 +370,42 @@
 	
 	public void PauseToggle(){
 		//pause/unpause
-		write_to_stdin("pause ");
+		if (App.PrimaryPlayer == "mpv"){

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaPlayerWindow.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/MediaPlayerWindow.vala Changed

@@ -1,5 +1,5 @@
 /*
- * MediaPlayerWindow.vala
+ * CropVideoSingleWindow.vala
 *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
 * 
@@ -35,74 +35,956 @@
 
 public class MediaPlayerWindow : Gtk.Window {
 	private Gtk.Box vboxMain;
+
+	//crop
+	private Gtk.SpinButton spinCropL;
+	private Gtk.SpinButton spinCropR;
+	private Gtk.SpinButton spinCropT;
+	private Gtk.SpinButton spinCropB;
+	private Gtk.Label lblSourceSize;
+	private Gtk.Label lblCroppedSize;
+	
+	//trim
+	private Gtk.Grid grid_trim_basic;
+	private Gtk.Grid grid_trim_advanced;
+	private Gtk.SpinButton spinStartPos;
+	private Gtk.SpinButton spinEndPos;
+
+	//player
 	private Gtk.DrawingArea canvas;
+	private Gtk.DrawingArea timeline;
 	private Gtk.Scale scalePos;
 	private Gtk.Scale scaleVolume;
 	private Gtk.Button btnPlay;
 	private Gtk.Button btnMute;
-	
+	private Gtk.Button btnFullscreen;
+	private Gtk.ComboBox cmbZoom;
 	private MediaPlayer player;
 	private MediaFile mFile;
-
+	private MediaClip mClipSelected;
+	private MediaClip mClipNew;
 	private uint tmr_status = 0;
+	private bool IsMaximized = false;
 	
-	public MediaPlayerWindow(MediaFile _mFile) {
-		//set_transient_for(parent);
-		//set_destroy_with_parent(true);
- //set_skip_taskbar_hint(true);
-		//window_position = WindowPosition.CENTER_ON_PARENT;
-		
+	//window
+	private uint tmr_init = 0;
+	private string action = "";
+	private bool crop_detect_is_running = false;
+	
+	public static Gtk.Window CropVideo(MediaFile mf, Gtk.Window parent){
+		var win = new MediaPlayerWindow(mf, parent, "crop");
+		parent.hide();
+		return win;
+	}
+
+	public static Gtk.Window TrimFile(MediaFile mf, Gtk.Window parent){
+		var win = new MediaPlayerWindow(mf, parent, "trim");
+		parent.hide();
+		return win;
+	}
+
+	public static Gtk.Window PlayFile(MediaFile mf){
+		var win = new MediaPlayerWindow(mf, null, "play");
+		return win;
+	}
+
+	public void set_window_parent(Gtk.Window? parent){
+		if (parent != null){
+			set_transient_for(parent);
+			set_destroy_with_parent(true);
+			set_modal(true);
+			//use destroy event (delete_event will not be trigerred for Finish button)
+			this.destroy.connect(()=>{
+				parent.present();
+				//return false;
+			});
+		}
+		else{
+			set_modal(false);
+		}
+	}
+	
+	public MediaPlayerWindow(MediaFile _mFile, Gtk.Window? parent, string _action) {
+ set_window_parent(parent);
+		//window_position = WindowPosition.CENTER_ALWAYS;
 		icon = get_app_icon(16);
-		modal = false;
+		
 		deletable = true;
 		resizable = false;
+
+		action = _action;
 		
 		player = new MediaPlayer();
-		title = "Selene Media Player";
-
+		player.mFile = _mFile;
 		mFile = _mFile;
 
-		// get content area
+		if (action == "crop"){
+			title = "Crop Video";
+		}
+		else if (action == "trim"){
+			title = "Trim";
+		}
+		else if (action == "play"){
+			title = mFile.Name + " - Selene";
+		}
+
+		//vboxMain
 		vboxMain = new Gtk.Box(Orientation.VERTICAL,0);
 		add(vboxMain);
-		
+
+		if (action == "crop"){
+			init_ui_file_crop_options();
+		}
+		else if (action == "trim"){
+			init_ui_file_trim_options();
+			init_ui_file_trim_options_advanced();
+		}
+
 		init_ui_player();
 
 		init_ui_player_controls();
 
-		this.delete_event.connect(()=>{
+		//use destroy event (delete_event will not be trigerred for Finish button)
+		this.destroy.connect(()=>{
+			status_timer_stop();
 			player.Exit();
-			return false;
+			//return false;
 		});
+		
+		show_all();
+		
+		tmr_init = Timeout.add(100, init_delayed);
+	}
+	
+	private bool init_delayed() {
+		/* any actions that need to run after window has been displayed */
+		
+		if (tmr_init > 0) {
+			Source.remove(tmr_init);
+			tmr_init = 0;
+		}
 
-		set_play_icon();
-		set_mute_icon();
+		if (action == "trim"){
+			if (mFile.clip_list.size > 0){
+				grid_trim_basic.visible = false;
+
+				grid_trim_advanced.no_show_all = false;
+				grid_trim_advanced.show_all();
+				grid_trim_advanced.visible = true;
+			}
+			else{
+				grid_trim_advanced.visible = false;
+
+				grid_trim_basic.no_show_all = false;
+				grid_trim_basic.show_all();
+				grid_trim_basic.visible = true;
+			}
+		}
+
+		load_file();
+
+		return false;
+	}
+	
+	private void init_ui_file_crop_options(){
+		var grid = new Gtk.Grid();
+		grid.margin = 6;
+		grid.row_spacing = 3;
+		grid.column_spacing = 3;
+		vboxMain.add(grid);
+		
+		Gtk.Adjustment adj;
+		Gtk.SpinButton spin;
+		Gtk.Label label;
+
+		string tt = _("Scroll mouse wheel to adjust");
+		
+		//left -----------------------------------------------
+		
+		label = new Gtk.Label(_("Left:"));
+		label.xalign = (float) 1.0;
+		grid.attach(label,0,0,1,1);
+
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/Utility.vala -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/Utility.vala Changed

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/makefile -> selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/makefile Changed

@@ -11,7 +11,7 @@
 
 all:
 	#build binaries
-	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "CropVideoSingleWindow.vala" "CropVideoBatchWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gdk-x11-3.0
+	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "BatchEditWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gdk-x11-3.0
 	#--pkg gdk-x11-3.0
 
 	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg libvte

selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/share/selene/images/view-fullscreen.png Added

selene_16.2.7~261~ubuntu16.04.1.tar.xz/src/share/selene/images/view-restore.png Added