Packman Build Service PMBS

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);
-		
-		tvFiles.row_activated.connect((path, column)=>{
-			var store = (Gtk.ListStore) tvFiles.model;
-			MediaFile mf;
-			TreeIter iter;
-			store.get_iter_from_string (out iter, path.to_string());
-			store.get (iter, 0, out mf, -1);
-
-			SelectedFile = mf;
-		
-			if (column == colEdit){
-				var win = new CropVideoSingleWindow(this, mf);
-				win.destroy.connect(()=>{
-					store.set(iter, 1, mf.CropL.to_string());
-					store.set(iter, 2, mf.CropR.to_string());
-					store.set(iter, 3, mf.CropT.to_string());
-					store.set(iter, 4, mf.CropB.to_string());
-				});
-			}
-		});
-	}
-
-	private void colCrop_cell_edited(string path, string new_text, CropInputField field){
-		TreeIter iter;
-		var model = (Gtk.ListStore) tvFiles.model;
-		MediaFile mf = null;
-		if (model.get_iter_from_string (out iter, path)){
-			model.get (iter, 0, out mf, -1);
-		}
-		else{
-			return;
-		}
-
-		switch (field){
-			case CropInputField.CROP_LEFT:
-				mf.CropL = int.parse(new_text);
-				break;
-			case CropInputField.CROP_RIGHT:
-				mf.CropR = int.parse(new_text);
-				break;
-			case CropInputField.CROP_TOP:
-				mf.CropT = int.parse(new_text);
-				break;
-			case CropInputField.CROP_BOTTOM:
-				mf.CropB = int.parse(new_text);
-				break;
-		}
-
-		model.set (iter, field, (new_text == "0") ? "" : new_text);
-	} 
-	
-	
-	private void refresh_list_view (){
-		var store = new Gtk.ListStore (5, 
-				typeof(MediaFile), 	//FILE_REF
-				typeof(string), 	//CROP_LEFT
-				typeof(string), 	//CROP_RIGHT
-				typeof(string), 	//CROP_TOP
-				typeof(string) 	//CROP_BOTTOM
-				);
-
-		TreeIter iter;
-		foreach(MediaFile mf in App.InputFiles) {
-			if (mf.HasVideo){
-				store.append (out iter);
-				store.set(iter, 0, mf);
-				store.set(iter, 1, mf.CropL.to_string());
-				store.set(iter, 2, mf.CropR.to_string());
-				store.set(iter, 3, mf.CropT.to_string());
-				store.set(iter, 4, mf.CropB.to_string());
-			}
-		}
-
-		tvFiles.set_model (store);
-		
-		tvFiles.columns_autosize();
-	}
-
-
-	private void btnOk_clicked(){
-		destroy();
-	}
-}
-
-public enum CropInputField{
-	FILE_REF,
-	CROP_LEFT,
-	CROP_RIGHT,
-	CROP_TOP,
-	CROP_BOTTOM
-}
-

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);
-
-		button.clicked.connect(btnDetect_clicked);
-
-		button = new Button.with_label(_("OK"));
-		button.margin_left = 18;
- grid.attach(button,6,1,1,1);
-
- button.clicked.connect(()=>{ this.destroy(); });
-	}
-
-	private void spin_value_changed_connect(){
-		spinCropL.value_changed.connect(spinCropL_value_changed);
-		spinCropR.value_changed.connect(spinCropR_value_changed);
-		spinCropT.value_changed.connect(spinCropT_value_changed);
-		spinCropB.value_changed.connect(spinCropB_value_changed);
-	}
-	
-	private void spin_value_changed_disconnect(){
-		spinCropL.value_changed.disconnect(spinCropL_value_changed);
-		spinCropR.value_changed.disconnect(spinCropR_value_changed);
-		spinCropT.value_changed.disconnect(spinCropT_value_changed);
-		spinCropB.value_changed.disconnect(spinCropB_value_changed);
-	}
-	
-	private void spinCropL_value_changed(){
-		int original = mFile.CropL;
-		int modified = (int) spinCropL.get_value();
-		int change = modified - original;
-		mFile.CropL = modified;
-		
-		player.ChangeRectangle(2, change);
-		player.ChangeRectangle(0, -change);
-		player.FrameStep();
-		
-		update_label_for_cropped_size();
-	}
-
-	private void spinCropR_value_changed(){
-		int original = mFile.CropR;
-		int modified = (int) spinCropR.get_value();
-		int change = modified - original;
-		mFile.CropR = modified;
-		
-		//player.ChangeRectangle(2, change);
-		player.ChangeRectangle(0, -change);
-		player.FrameStep();
-		
-		update_label_for_cropped_size();
-	}
-
-	private void spinCropT_value_changed(){
-		int original = mFile.CropT;
-		int modified = (int) spinCropT.get_value();
-		int change = modified - original;
-		mFile.CropT = modified;
-		
-		player.ChangeRectangle(3, change);
-		player.ChangeRectangle(1, -change);
-		player.FrameStep();
-		
-		update_label_for_cropped_size();
-	}
-
-	private void spinCropB_value_changed(){
-		int original = mFile.CropB;
-		int modified = (int) spinCropB.get_value();
-		int change = modified - original;
-		mFile.CropB = modified;
-		
-		//player.ChangeRectangle(3, change);
-		player.ChangeRectangle(1, -change);
-		player.FrameStep();
-		
-		update_label_for_cropped_size();
-	}
-	
-	private void init_ui_player(){
-		var hboxSlider = new Gtk.Box(Orientation.HORIZONTAL,6);
-		hboxSlider.margin_left = 6;
-		hboxSlider.margin_right = 6;
-		//hboxSlider.set_size_request(600,600);
-		vboxMain.add(hboxSlider);
-		
-		scalePos = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, (mFile.Duration/1000), 1);
-		scalePos.adjustment.value = 0;
-		scalePos.has_origin = false;
-		scalePos.draw_value = false;
-		scalePos.expand = true;
-		//scalePos.value_pos = PositionType.RIGHT;
-		hboxSlider.add(scalePos);
-
-		scalePos.value_changed.connect (() => {
-			player.Seek(scalePos.get_value());
-		});
-
-		//cmbZoom
-		cmbZoom = new ComboBox();
-		var textCell = new CellRendererText();
- cmbZoom.pack_start(textCell, false);
- cmbZoom.set_attributes(textCell, "text", 0);
- hboxSlider.add(cmbZoom);
-
- //populate
- TreeIter iter;
-		var model = new Gtk.ListStore (2, typeof (string), typeof (string));
-		model.append (out iter);
-		model.set (iter,0,_("25%"),1,"0.25");
-		model.append (out iter);
-		model.set (iter,0,_("50%"),1,"0.50");
-		model.append (out iter);
-		model.set (iter,0,_("75%"),1,"0.75");
-		model.append (out iter);
-		model.set (iter,0,_("100%"),1,"1.0");
-		model.append (out iter);
-		model.set (iter,0,_("200%"),1,"2.0");
-		cmbZoom.set_model(model);
-
-		if (mFile.SourceWidth > (Gdk.Screen.get_default().get_width() / 2)){
-			cmbZoom.active = 2;
-		}
-		else{
-			cmbZoom.active = 3;
-		}
-		
-		cmbZoom.changed.connect(cmbZoom_changed);
-		
-		canvas = new Gtk.DrawingArea();
-		canvas.set_size_request(400,300);
-		canvas.expand = true;
-		canvas.halign = Align.START;
-		vboxMain.pack_start (canvas, false, false, 0);
-
- this.canvas.realize.connect(() => {
-			player.WindowID = get_widget_xid(canvas);
-			player.StartPlayerWithRectangle();
-		});
-
-		this.delete_event.connect(()=>{
-			player.Exit();
-			return false;
-		});
-	}
-
-
-	private void load_file(){
-		cmbZoom_changed();
-		player.Open(mFile, true, true, true);
-
- spin_value_changed_disconnect();
- 
-		spinCropL.adjustment.value = mFile.CropL;
-		spinCropR.adjustment.value = mFile.CropR;
-		spinCropT.adjustment.value = mFile.CropT;
-		spinCropB.adjustment.value = mFile.CropB;
-		
-		lblSourceSize.label = "%dx%d".printf(mFile.SourceWidth,mFile.SourceHeight);
-		update_label_for_cropped_size();
-		
-		spin_value_changed_connect();
-
-		//player.SetRectangle();
-		//player.FrameStep();
-	}
-	
-	private void btnDetect_clicked(){
-		player.Exit();
-		//sleep(2000);
-		player.StartPlayerWithCropDetect();
-		player.Open(mFile, false, true, true);
-
-		
-		var status_msg = _("Detecting borders...");
-		var dlg = new SimpleProgressWindow.with_parent(this, status_msg);
-		dlg.set_title(_("Please Wait..."));
-		dlg.show_all();
-		gtk_do_events();
-
-		//get total count
-		App.progress_total = 10;
-		App.progress_count = 0;
-
-		mFile.CropL = 9999;
-		mFile.CropR = 9999;
-		mFile.CropT = 9999;
-		mFile.CropB = 9999;
-		
-		double duration = (mFile.Duration / 1000.0);
-		double step = duration / 10.0;
-		for(int i = 0; i < 10; i++){
-			player.Seek(step * i);
-			sleep(100);
-			App.progress_count++;
-			dlg.update_progressbar();
-		}
-
-		dlg.finish(_("Detected Parameters: %d, %d, %d, %d").printf(mFile.CropL,mFile.CropR,mFile.CropT,mFile.CropB));
-		
-		//dlg.close();
-		//gtk_do_events();
-
-		player.Exit();
-		player.StartPlayerWithRectangle();
-
-		load_file();
-	}
-	
-	private void update_label_for_cropped_size(){
-		lblCroppedSize.label = "%dx%d".printf((mFile.SourceWidth - mFile.CropL - mFile.CropR),(mFile.SourceHeight - mFile.CropT - mFile.CropB));
-	}
-
-	private void cmbZoom_changed(){
-		double zoom = double.parse(gtk_combobox_get_value(cmbZoom,1,"1.0"));
-		int zoomWidth = (int) (mFile.SourceWidth * zoom * 1.0);
-		int zoomHeight = (int) (mFile.SourceHeight * zoom * 1.0);
-		canvas.set_size_request(zoomWidth, zoomHeight);
-		this.resize(1,1);
-		gtk_do_events();
-	}
-}
-

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 @@
 msgid "Back"
 msgstr ""
 
-#: MainWindow.vala:255
+#: MainWindow.vala:261
 msgid "Background"
 msgstr ""
 
+#: MediaPlayerWindow.vala:472
+msgid "Basic Mode"
+msgstr ""
+
 #: EncoderConfigWindow.vala:652
 msgid "Bass (lower freq)"
 msgstr ""
@@ -371,7 +379,7 @@
 msgid "Best"
 msgstr ""
 
-#: MainWindow.vala:611
+#: MainWindow.vala:659
 msgid "Bitrate"
 msgstr ""
 
@@ -387,23 +395,23 @@
 msgid "Boost or cut the treble (upper) frequencies of the audio."
 msgstr ""
 
-#: CropVideoBatchWindow.vala:173
+#: BatchEditWindow.vala:210
 msgid "Bottom"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:163
+#: MediaPlayerWindow.vala:243
 msgid "Bottom:"
 msgstr ""
 
-#: MainWindow.vala:1151
+#: MainWindow.vala:1198
 msgid "Browse"
 msgstr ""
 
-#: MainWindow.vala:2633
+#: MainWindow.vala:2672
 msgid "CPU: "
 msgstr ""
 
-#: Main.vala:1210 Main.vala:1224
+#: Main.vala:1230 Main.vala:1244
 msgid "Cancelled"
 msgstr ""
 
@@ -422,7 +430,7 @@
 msgid "Channels"
 msgstr ""
 
-#: MainWindow.vala:393
+#: MainWindow.vala:399
 msgid "Clear List"
 msgstr ""
 
@@ -430,15 +438,15 @@
 msgid "Close"
 msgstr ""
 
-#: MainWindow.vala:963
+#: MainWindow.vala:1010
 msgid "Columns..."
 msgstr ""
 
-#: MainWindow.vala:798
+#: MainWindow.vala:846
 msgid "Comments"
 msgstr ""
 
-#: Main.vala:1049 Main.vala:1059 Main.vala:1067
+#: Main.vala:1069 Main.vala:1079 Main.vala:1087
 msgid "Completed"
 msgstr ""
 
@@ -451,16 +459,16 @@
 msgid "Constant Bitrate (Strict)"
 msgstr ""
 
-#: Main.vala:965 Main.vala:1258
+#: Main.vala:985 Main.vala:1278
 msgid "Converting..."
 msgstr ""
 
-#: MainWindow.vala:1680
+#: MainWindow.vala:1727
 #, c-format
 msgid "Converting: '%s'"
 msgstr ""
 
-#: Main.vala:963 Main.vala:1256
+#: Main.vala:983 Main.vala:1276
 msgid "Converting: Enter (q) to quit or (p) to pause..."
 msgstr ""
 
@@ -468,23 +476,23 @@
 msgid "Credits"
 msgstr ""
 
-#: MainWindow.vala:222
+#: MainWindow.vala:445
 msgid "Crop"
 msgstr ""
 
-#: CropVideoBatchWindow.vala:122
+#: BatchEditWindow.vala:159
 msgid "Crop Left"
 msgstr ""
 
-#: MainWindow.vala:882
+#: MainWindow.vala:916
 msgid "Crop Video..."
 msgstr ""
 
-#: MainWindow.vala:224
+#: MainWindow.vala:429 MainWindow.vala:448
 msgid "Crop Videos"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:182
+#: MediaPlayerWindow.vala:263
 msgid "Cropped:"
 msgstr ""
 
@@ -492,10 +500,14 @@
 msgid "Custom"
 msgstr ""
 
-#: MainWindow.vala:1138
+#: MainWindow.vala:1185
 msgid "Delete Preset"
 msgstr ""
 
+#: MediaPlayerWindow.vala:454
+msgid "Delete Segment"
+msgstr ""
+
 #: EncoderConfigWindow.vala:1238
 msgid "Denominator"
 msgstr ""
@@ -504,20 +516,20 @@
 msgid "Description"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:195
+#: MediaPlayerWindow.vala:278
 msgid "Detect Borders"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:197
+#: MediaPlayerWindow.vala:280
 msgid "Detect black borders in the video and set cropping parameters"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:394
+#: MediaPlayerWindow.vala:849
 #, c-format
 msgid "Detected Parameters: %d, %d, %d, %d"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:370
+#: BatchEditWindow.vala:403 MediaPlayerWindow.vala:781
 msgid "Detecting borders..."
 msgstr ""
 
@@ -556,7 +568,7 @@
 msgid "Documenters"
 msgstr ""
 
-#: DonationWindow.vala:36 MainWindow.vala:295 MainWindow.vala:296
+#: DonationWindow.vala:36 MainWindow.vala:301 MainWindow.vala:302
 msgid "Donate"
 msgstr ""
 
@@ -573,7 +585,7 @@
 msgid "Donations"
 msgstr ""
 
-#: Main.vala:1044
+#: Main.vala:1064
 msgid "Done"
 msgstr ""
 
@@ -581,15 +593,19 @@
 msgid "Drag and drop to re-order"
 msgstr ""
 
-#: MainWindow.vala:1668
+#: MainWindow.vala:1715
 msgid "Drag files on this window or click the 'Add' button"
 msgstr ""
 
-#: MainWindow.vala:526
+#: MainWindow.vala:574
 msgid "Duration"
 msgstr ""
 
-#: MainWindow.vala:1224
+#: BatchEditWindow.vala:267
+msgid "Edit"
+msgstr ""
+
+#: MainWindow.vala:1271
 msgid "Edit Preset"
 msgstr ""
 
@@ -605,7 +621,7 @@
 msgid "Empty Preset Name"
 msgstr ""
 
-#: EncoderStatusWindow.vala:45 MainWindow.vala:288
+#: EncoderStatusWindow.vala:45 MainWindow.vala:294
 msgid "Encoders"
 msgstr ""
 
@@ -613,23 +629,35 @@
 msgid "Encoding Mode"
 msgstr ""
 
-#: MainWindow.vala:1214
+#: MainWindow.vala:1261
 msgid "Encoding Script or Preset File"
 msgstr ""
 
-#: Main.vala:736
+#: MediaPlayerWindow.vala:324
+msgid "End (sec):"
+msgstr ""
+
+#: MediaPlayerWindow.vala:438
+msgid "End Segment"
+msgstr ""
+
+#: BatchEditWindow.vala:247
+msgid "EndPos"
+msgstr ""
+
+#: Main.vala:755
 msgid "Enter any key to Cancel..."
 msgstr ""
 
-#: AppConfigWindow.vala:119 AppConfigWindow.vala:165
+#: AppConfigWindow.vala:120 AppConfigWindow.vala:166
 msgid "Enter path or browse for directory"
 msgstr ""
 
-#: Main.vala:1054 Utility.vala:108
+#: Main.vala:1074 Utility.vala:108
 msgid "Error"
 msgstr ""
 
-#: Main.vala:771
+#: Main.vala:790
 msgid "Error: File missing"
 msgstr ""
 
@@ -665,7 +693,7 @@
 msgid "Fade Type"
 msgstr ""
 
-#: Main.vala:1070
+#: Main.vala:1090
 msgid "Failed"
 msgstr ""
 
@@ -677,37 +705,36 @@
 msgid "Fast"
 msgstr ""
 
-#: ColumnSelectionDialog.vala:76 CropVideoBatchWindow.vala:103
-#: MainWindow.vala:432
+#: BatchEditWindow.vala:139 ColumnSelectionDialog.vala:76 MainWindow.vala:480
 msgid "File"
 msgstr ""
 
-#: MainWindow.vala:952
+#: MainWindow.vala:999
 msgid "File Info (Output)"
 msgstr ""
 
-#: MainWindow.vala:946
+#: MainWindow.vala:993
 msgid "File Info (Source)"
 msgstr ""
 
-#: AppConfigWindow.vala:206
+#: AppConfigWindow.vala:207
 msgid "File View"
 msgstr ""
 
-#: Main.vala:635
+#: Main.vala:654
 msgid "File added:"
 msgstr ""
 
-#: Main.vala:649
+#: Main.vala:668
 msgid "File removed:"
 msgstr ""
 
-#: Main.vala:672
+#: Main.vala:691
 #, c-format
 msgid "Files will be saved in '%s'"
 msgstr ""
 
-#: Main.vala:675
+#: Main.vala:694
 msgid "Files will be saved in source directory"
 msgstr ""
 
@@ -715,7 +742,8 @@
 msgid "Filters"
 msgstr ""
 
-#: MainWindow.vala:266 MainWindow.vala:268
+#: MainWindow.vala:272 MainWindow.vala:274 MediaPlayerWindow.vala:287
+#: MediaPlayerWindow.vala:373 MediaPlayerWindow.vala:485
 msgid "Finish"
 msgstr ""
 
@@ -727,11 +755,11 @@
 msgid "Fixed Bitrate"
 msgstr ""
 
-#: MainWindow.vala:1189 MainWindow.vala:1199
+#: MainWindow.vala:1236 MainWindow.vala:1246
 msgid "Folder"
 msgstr ""
 
-#: MainWindow.vala:2457
+#: MainWindow.vala:2496
 msgid "Following encoders were not found on your system:"
 msgstr ""
 
@@ -739,7 +767,7 @@
 msgid "Following utilities are not installed on your system:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:295 MainWindow.vala:538
+#: EncoderConfigWindow.vala:295 MainWindow.vala:586
 msgid "Format"
 msgstr ""
 
@@ -759,11 +787,15 @@
 msgid "Frames/sec"
 msgstr ""
 
-#: AppConfigWindow.vala:96 EncoderConfigWindow.vala:271
+#: MediaPlayerWindow.vala:1160 MediaPlayerWindow.vala:1164
+msgid "Fullscreen"
+msgstr ""
+
+#: AppConfigWindow.vala:97 EncoderConfigWindow.vala:271
 msgid "General"
 msgstr ""
 
-#: MainWindow.vala:761
+#: MainWindow.vala:809
 msgid "Genre"
 msgstr ""
 
@@ -789,15 +821,15 @@
 msgid "Height"
 msgstr ""
 
-#: MainWindow.vala:1166 MainWindow.vala:1168 MainWindow.vala:1624
+#: MainWindow.vala:1213 MainWindow.vala:1215 MainWindow.vala:1671
 msgid "Info"
 msgstr ""
 
-#: Main.vala:663
+#: Main.vala:682
 msgid "Input queue is empty! Please add some files."
 msgstr ""
 
-#: Main.vala:246
+#: Main.vala:247
 msgid "Input queue is empty! Please select files to convert."
 msgstr ""
 
@@ -809,7 +841,7 @@
 msgid "Key"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:115
+#: MediaPlayerWindow.vala:204
 msgid "Left:"
 msgstr ""
 
@@ -817,7 +849,7 @@
 msgid "Linear"
 msgstr ""
 
-#: AppConfigWindow.vala:219
+#: AppConfigWindow.vala:220
 msgid "List"
 msgstr ""
 
@@ -837,7 +869,7 @@
 msgid "Lossless"
 msgstr ""
 
-#: Main.vala:785 Main.vala:788
+#: Main.vala:804 Main.vala:807
 msgid "Lyrics:"
 msgstr ""
 
@@ -893,7 +925,7 @@
 msgid "Missing"
 msgstr ""
 
-#: MainWindow.vala:2457
+#: MainWindow.vala:2496
 msgid "Missing Encoders"
 msgstr ""
 
@@ -905,7 +937,7 @@
 msgid "Missing Utilities"
 msgstr ""
 
-#: AppConfigWindow.vala:156
+#: AppConfigWindow.vala:157
 msgid "Move source files after encoding is complete"
 msgstr ""
 
@@ -913,11 +945,11 @@
 msgid "Music"
 msgstr ""
 
-#: MediaPlayerWindow.vala:186
+#: MediaPlayerWindow.vala:1148 MediaPlayerWindow.vala:1152
 msgid "Mute"
 msgstr ""
 
-#: MediaFile.vala:338
+#: MediaFile.vala:344
 msgid "N/A"
 msgstr ""
 
@@ -925,7 +957,7 @@
 msgid "Name"
 msgstr ""
 
-#: EncoderConfigWindow.vala:359 MainWindow.vala:1129
+#: EncoderConfigWindow.vala:359 MainWindow.vala:1176
 msgid "New Preset"
 msgstr ""
 
@@ -937,10 +969,14 @@
 msgid "No Change"
 msgstr ""
 
-#: MainWindow.vala:2415 MainWindow.vala:2441
+#: MainWindow.vala:2320 MainWindow.vala:2346 MainWindow.vala:2480
 msgid "No Files"
 msgstr ""
 
+#: BatchEditWindow.vala:397 BatchEditWindow.vala:461
+msgid "No Files Selected"
+msgstr ""
+
 #: EncoderConfigWindow.vala:1524
 msgid "No Subtitles"
 msgstr ""
@@ -949,7 +985,7 @@
 msgid "No Up-Scaling"
 msgstr ""
 
-#: MainWindow.vala:2429
+#: MainWindow.vala:2334
 msgid "No Videos"
 msgstr ""
 
@@ -973,27 +1009,27 @@
 msgid "OGG Vorbis Audio (*.ogg)"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:202 DonationWindow.vala:95
+#: DonationWindow.vala:95
 msgid "OK"
 msgstr ""
 
-#: MainWindow.vala:1153
+#: MainWindow.vala:1200
 msgid "Open Folder"
 msgstr ""
 
-#: MainWindow.vala:923
+#: MainWindow.vala:970
 msgid "Open Log File"
 msgstr ""
 
-#: MainWindow.vala:917
+#: MainWindow.vala:964
 msgid "Open Output Folder"
 msgstr ""
 
-#: MainWindow.vala:911
+#: MainWindow.vala:958
 msgid "Open Temp Folder"
 msgstr ""
 
-#: MainWindow.vala:324
+#: MainWindow.vala:330
 msgid "Open output folder"
 msgstr ""
 
@@ -1005,20 +1041,20 @@
 msgid "Opus Audio (*.opus)"
 msgstr ""
 
-#: MainWindow.vala:322
+#: MainWindow.vala:328
 msgid "Output"
 msgstr ""
 
-#: MainWindow.vala:239 MainWindow.vala:2396 MainWindow.vala:2398
-#: MediaPlayerWindow.vala:174
+#: MainWindow.vala:245 MainWindow.vala:2461 MainWindow.vala:2463
+#: MediaPlayerWindow.vala:1140
 msgid "Pause"
 msgstr ""
 
-#: Main.vala:1237 Main.vala:1242
+#: Main.vala:1257 Main.vala:1262
 msgid "Paused"
 msgstr ""
 
-#: Main.vala:1240
+#: Main.vala:1260
 msgid "Paused: Enter (r) to resume..."
 msgstr ""
 
@@ -1026,19 +1062,19 @@
 msgid "Pitch (shrillness)"
 msgstr ""
 
-#: MediaPlayerWindow.vala:170
+#: MediaPlayerWindow.vala:1136
 msgid "Play"
 msgstr ""
 
-#: MainWindow.vala:940
+#: MainWindow.vala:987
 msgid "Play File (Output)"
 msgstr ""
 
-#: MainWindow.vala:934
+#: MainWindow.vala:981
 msgid "Play File (Source)"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:372
+#: MediaPlayerWindow.vala:783
 msgid "Please Wait..."
 msgstr ""
 
@@ -1046,7 +1082,7 @@
 msgid "Please enter a name for this preset"
 msgstr ""
 
-#: MainWindow.vala:2457
+#: MainWindow.vala:2496
 msgid "Please install required packages or select another preset"
 msgstr ""
 
@@ -1054,15 +1090,15 @@
 msgid "Please install the 'sox' package on your system to use this feature"
 msgstr ""
 
-#: EncoderConfigWindow.vala:941 MainWindow.vala:1204
+#: EncoderConfigWindow.vala:941 MainWindow.vala:1251
 msgid "Preset"
 msgstr ""
 
-#: MainWindow.vala:1562
+#: MainWindow.vala:1609
 msgid "Preset deleted"
 msgstr ""
 
-#: MainWindow.vala:2563
+#: MainWindow.vala:2602
 msgid "Press 'Cancel' to abort shutdown"
 msgstr ""
 
@@ -1082,11 +1118,11 @@
 msgid "Quarter Sine"
 msgstr ""
 
-#: Main.vala:693 Main.vala:752 MediaFile.vala:44
+#: Main.vala:712 Main.vala:771 MediaFile.vala:48
 msgid "Queued"
 msgstr ""
 
-#: MainWindow.vala:2037
+#: MainWindow.vala:2063
 msgid "Reading file properties..."
 msgstr ""
 
@@ -1094,7 +1130,7 @@
 msgid "Realtime"
 msgstr ""
 
-#: MainWindow.vala:810
+#: MainWindow.vala:858
 msgid "Recorded Date"
 msgstr ""
 
@@ -1102,11 +1138,11 @@
 msgid "Refresh"
 msgstr ""
 
-#: MainWindow.vala:400
+#: MainWindow.vala:406
 msgid "Remove File(s)"
 msgstr ""
 
-#: MainWindow.vala:381
+#: MainWindow.vala:387
 msgid "Remove Selected Items"
 msgstr ""
 
@@ -1123,23 +1159,23 @@
 msgid "Resolution"
 msgstr ""
 
-#: MainWindow.vala:2390 MainWindow.vala:2392
+#: MainWindow.vala:2455 MainWindow.vala:2457
 msgid "Resume"
 msgstr ""
 
-#: CropVideoBatchWindow.vala:139
+#: BatchEditWindow.vala:176
 msgid "Right"
 msgstr ""
 
-#: CropVideoBatchWindow.vala:86 MainWindow.vala:417
+#: MainWindow.vala:465
 msgid "Right-click for more options"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:131
+#: MediaPlayerWindow.vala:217
 msgid "Right:"
 msgstr ""
 
-#: MainWindow.vala:260
+#: MainWindow.vala:266
 msgid "Run in background with lower priority"
 msgstr ""
 
@@ -1151,11 +1187,11 @@
 msgid "Sampling Rate (Hz)"
 msgstr ""
 
-#: AppConfigWindow.vala:110
+#: AppConfigWindow.vala:111
 msgid "Save files in following location"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:112
+#: MediaPlayerWindow.vala:200
 msgid "Scroll mouse wheel to adjust"
 msgstr ""
 
@@ -1163,18 +1199,42 @@
 msgid "Select Columns"
 msgstr ""
 
-#: AppConfigWindow.vala:129 AppConfigWindow.vala:175
+#: AppConfigWindow.vala:130 AppConfigWindow.vala:176
 msgid "Select Path"
 msgstr ""
 
-#: MainWindow.vala:1666
+#: MainWindow.vala:1713
 msgid "Select a script from the dropdown and click 'Start' to begin"
 msgstr ""
 
+#: MediaPlayerWindow.vala:360
+msgid "Select multiple segments"
+msgstr ""
+
+#: BatchEditWindow.vala:398 BatchEditWindow.vala:462
+msgid "Select some files from the list"
+msgstr ""
+
+#: MediaPlayerWindow.vala:396
+msgid "Select the segments to include in output file:"
+msgstr ""
+
 #: DonationWindow.vala:81
 msgid "Send Email"
 msgstr ""
 
+#: MediaPlayerWindow.vala:338 MediaPlayerWindow.vala:348
+msgid "Set"
+msgstr ""
+
+#: MediaPlayerWindow.vala:349
+msgid "Set current playback position as ending position"
+msgstr ""
+
+#: MediaPlayerWindow.vala:339
+msgid "Set current playback position as starting position"
+msgstr ""
+
 #: EncoderConfigWindow.vala:1108
 msgid ""
 "Set either Width or Height and leave the other as 0.\n"
@@ -1186,27 +1246,27 @@
 "Enable the 'Fit-To-Box' option to avoid changes to aspect ratio."
 msgstr ""
 
-#: MainWindow.vala:311
+#: MainWindow.vala:317
 msgid "Shutdown"
 msgstr ""
 
-#: MainWindow.vala:2368
+#: MainWindow.vala:2433
 msgid "Shutdown Disabled"
 msgstr ""
 
-#: MainWindow.vala:2365
+#: MainWindow.vala:2430
 msgid "Shutdown Enabled"
 msgstr ""
 
-#: MainWindow.vala:316
+#: MainWindow.vala:322
 msgid "Shutdown system after completion"
 msgstr ""
 
-#: MainWindow.vala:508
+#: MainWindow.vala:556
 msgid "Size"
 msgstr ""
 
-#: MainWindow.vala:877
+#: MainWindow.vala:911
 msgid "Skip File"
 msgstr ""
 
@@ -1218,16 +1278,16 @@
 msgid "Slower"
 msgstr ""
 
-#: MainWindow.vala:2075
+#: MainWindow.vala:2101
 msgid "Some files could not be opened:"
 msgstr ""
 
-#: Main.vala:681
+#: Main.vala:700
 #, c-format
 msgid "Source files will be moved to '%s'"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:177 Main.vala:783
+#: Main.vala:802 MediaPlayerWindow.vala:256
 msgid "Source:"
 msgstr ""
 
@@ -1243,16 +1303,28 @@
 msgid "Speed"
 msgstr ""
 
-#: MainWindow.vala:230 MainWindow.vala:232
+#: MainWindow.vala:236 MainWindow.vala:238
 msgid "Start"
 msgstr ""
 
-#: Main.vala:667
+#: MediaPlayerWindow.vala:310
+msgid "Start (sec):"
+msgstr ""
+
+#: MediaPlayerWindow.vala:425
+msgid "Start Segment"
+msgstr ""
+
+#: BatchEditWindow.vala:228
+msgid "StartPos"
+msgstr ""
+
+#: Main.vala:686
 #, c-format
 msgid "Starting batch of %d file(s):"
 msgstr ""
 
-#: EncoderStatusWindow.vala:98 MainWindow.vala:837
+#: EncoderStatusWindow.vala:98 MainWindow.vala:871
 msgid "Status"
 msgstr ""
 
@@ -1260,7 +1332,7 @@
 msgid "Stopped"
 msgstr ""
 
-#: Main.vala:1064
+#: Main.vala:1084
 msgid "Stopped!"
 msgstr ""
 
@@ -1276,7 +1348,7 @@
 msgid "Subtitles"
 msgstr ""
 
-#: Main.vala:785 Main.vala:788
+#: Main.vala:804 Main.vala:807
 msgid "Subtitles:"
 msgstr ""
 
@@ -1289,20 +1361,20 @@
 msgid "Supported Formats:"
 msgstr ""
 
-#: MainWindow.vala:2565
+#: MainWindow.vala:2604
 msgid "System shutdown"
 msgstr ""
 
-#: MainWindow.vala:2572
+#: MainWindow.vala:2611
 #, c-format
 msgid "System shutdown was cancelled by user!"
 msgstr ""
 
-#: Main.vala:221
+#: Main.vala:222
 msgid "System will be shutdown after completion"
 msgstr ""
 
-#: Main.vala:735 MainWindow.vala:2562
+#: Main.vala:754 MainWindow.vala:2601
 msgid "System will shutdown in one minute!"
 msgstr ""
 
@@ -1328,11 +1400,11 @@
 msgid "Third Party Tools &amp; Software"
 msgstr ""
 
-#: AppConfigWindow.vala:221
+#: AppConfigWindow.vala:222
 msgid "Tiles"
 msgstr ""
 
-#: MainWindow.vala:773
+#: MainWindow.vala:821
 msgid "Title"
 msgstr ""
 
@@ -1340,19 +1412,19 @@
 msgid "Tool"
 msgstr ""
 
-#: AppConfigWindow.vala:235
+#: AppConfigWindow.vala:236
 msgid "Tools"
 msgstr ""
 
-#: CropVideoBatchWindow.vala:156
+#: BatchEditWindow.vala:193
 msgid "Top"
 msgstr ""
 
-#: CropVideoSingleWindow.vala:147
+#: MediaPlayerWindow.vala:230
 msgid "Top:"
 msgstr ""
 
-#: MainWindow.vala:785
+#: MainWindow.vala:833
 msgid "Track #"
 msgstr ""
 
@@ -1365,39 +1437,43 @@
 msgid "Treble (upper freq)"
 msgstr ""
 
+#: MainWindow.vala:440
+msgid "Trim Duration"
+msgstr ""
+
+#: MainWindow.vala:921
+msgid "Trim Duration..."
+msgstr ""
+
 #: EncoderConfigWindow.vala:949
 msgid "UltraFast"
 msgstr ""
 
-#: Main.vala:640
+#: Main.vala:659
 msgid "Unknown format:"
 msgstr ""
 
-#: MediaPlayerWindow.vala:182
-msgid "Unmute"
-msgstr ""
-
 #: Main.vala:379
 msgid "Using temp folder:"
 msgstr ""
 
-#: MainWindow.vala:662
+#: MainWindow.vala:710
 msgid "V-Bitrate"
 msgstr ""
 
-#: MainWindow.vala:562
+#: MainWindow.vala:610
 msgid "V-Fmt"
 msgstr ""
 
-#: MainWindow.vala:718
+#: MainWindow.vala:766
 msgid "V-Fps"
 msgstr ""
 
-#: MainWindow.vala:699
+#: MainWindow.vala:747
 msgid "V-Height"
 msgstr ""
 
-#: MainWindow.vala:680
+#: MainWindow.vala:728
 msgid "V-Width"
 msgstr ""
 
@@ -1449,7 +1525,7 @@
 msgid "Warning"
 msgstr ""
 
-#: Main.vala:224
+#: Main.vala:225
 msgid ""
 "Warning: User does not have Admin priviledges. '--shutdown' will be ignored."
 msgstr ""
@@ -1466,27 +1542,35 @@
 msgid "Width x Height"
 msgstr ""
 
-#: MainWindow.vala:1672
+#: MainWindow.vala:1719
 msgid ""
 "[Batch completed] Right-click for options or click 'Finish' to continue."
 msgstr ""
 
-#: MainWindow.vala:1676
+#: MainWindow.vala:1723
 msgid "[Paused] Click 'Resume' to continue or 'Stop' to abort."
 msgstr ""
 
-#: AppConfigWindow.vala:262
+#: AppConfigWindow.vala:263
 msgid "avconv / Libav"
 msgstr ""
 
-#: AppConfigWindow.vala:260
+#: AppConfigWindow.vala:261
 msgid "ffmpeg"
 msgstr ""
 
-#: MainWindow.vala:1275
+#: AppConfigWindow.vala:308
+msgid "mplayer"
+msgstr ""
+
+#: AppConfigWindow.vala:306
+msgid "mpv"
+msgstr ""
+
+#: MainWindow.vala:1322
 msgid "presets"
 msgstr ""
 
-#: MainWindow.vala:1271
+#: MainWindow.vala:1318
 msgid "scripts"
 msgstr ""

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;
+		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_TOP);
+		});
+		
+		colCropT.pack_start (cellSpin, false);
+		colCropT.set_attributes(cellSpin, "text", TreeColumn.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, TreeColumn.CROP_BOTTOM);
+		});
+		
+		colCropB.pack_start (cellSpin, false);
+		colCropB.set_attributes(cellSpin, "text", TreeColumn.CROP_BOTTOM);
+
+		//colStartPos --------------------------------------------
+		
+		colStartPos = new TreeViewColumn();
+		colStartPos.title = _("StartPos");
+		colStartPos.fixed_width = 80;
+		tvFiles.append_column(colStartPos);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.digits = 1;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, TreeColumn.START_POS);
+		});
+		
+		colStartPos.pack_start (cellSpin, false);
+		colStartPos.set_attributes(cellSpin, "text", TreeColumn.START_POS);
+
+		//colEndPos ----------------------------------------------
+		
+		colEndPos = new TreeViewColumn();
+		colEndPos.title = _("EndPos");
+		colEndPos.fixed_width = 80;
+		tvFiles.append_column(colEndPos);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.digits = 1;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, TreeColumn.END_POS);
+		});
+		
+		colEndPos.pack_start (cellSpin, false);
+		colEndPos.set_attributes(cellSpin, "text", TreeColumn.END_POS);
+
+		//colEdit
+		var pixbuf = new Gtk.CellRendererPixbuf();
+		pixbuf.icon_name = "gtk-edit";
+		colEdit = new Gtk.TreeViewColumn();
+		colEdit.title = _("Edit");
+		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);
+		
+		tvFiles.row_activated.connect((path, column)=>{
+			var store = (Gtk.ListStore) tvFiles.model;
+			MediaFile mf;
+			TreeIter iter;
+			store.get_iter_from_string (out iter, path.to_string());
+			store.get (iter, 0, out mf, -1);
+
+			SelectedFile = mf;
+		
+			if (column == colEdit){
+				if (action == "crop"){
+					var win = MediaPlayerWindow.CropVideo(mf, this);
+					win.destroy.connect(()=>{
+						store.set(iter, TreeColumn.CROP_LEFT, mf.CropL.to_string());
+						store.set(iter, TreeColumn.CROP_RIGHT, mf.CropR.to_string());
+						store.set(iter, TreeColumn.CROP_TOP, mf.CropT.to_string());
+						store.set(iter, TreeColumn.CROP_BOTTOM, mf.CropB.to_string());
+					});
+				}
+				else if (action == "trim"){
+					var win = MediaPlayerWindow.TrimFile(mf, this);
+					win.destroy.connect(()=>{
+						store.set(iter, TreeColumn.START_POS, "%.1f".printf(mf.StartPos));
+						store.set(iter, TreeColumn.END_POS, "%.1f".printf(mf.EndPos));
+					});
+				}
+			}
+		});
+	}
+
+	private void colCrop_cell_edited(string path, string new_text, TreeColumn field){
+		TreeIter iter;
+		var model = (Gtk.ListStore) tvFiles.model;
+		MediaFile mf = null;
+		if (model.get_iter_from_string (out iter, path)){
+			model.get (iter, 0, out mf, -1);
+		}
+		else{
+			return;
+		}
+
+		switch (field){
+			case TreeColumn.CROP_LEFT:
+				mf.CropL = int.parse(new_text);
+				break;
+			case TreeColumn.CROP_RIGHT:
+				mf.CropR = int.parse(new_text);
+				break;
+			case TreeColumn.CROP_TOP:
+				mf.CropT = int.parse(new_text);
+				break;
+			case TreeColumn.CROP_BOTTOM:
+				mf.CropB = int.parse(new_text);
+				break;
+			case TreeColumn.START_POS:
+				mf.StartPos = double.parse(new_text);
+				break;
+			case TreeColumn.END_POS:
+				mf.EndPos = double.parse(new_text);
+				break;
+		}
+
+		model.set (iter, field, (new_text == "0") ? "" : new_text);
+	} 
+	
+	private void refresh_list_view (){
+		var store = new Gtk.ListStore (7, 
+				typeof(MediaFile), 	//FILE_REF
+				typeof(string), 	//CROP_LEFT
+				typeof(string), 	//CROP_RIGHT
+				typeof(string), 	//CROP_TOP
+				typeof(string), 	//CROP_BOTTOM
+				typeof(string),		//START_POS
+				typeof(string) 		//END_POS
+				);
+
+		TreeIter iter;
+		foreach(MediaFile mf in App.InputFiles) {
+
+			if (action == "crop"){
+				if (!mf.HasVideo){
+					continue;
+				}
+			}
+			
+			store.append (out iter);
+			store.set(iter, TreeColumn.FILE_REF, mf);
+			store.set(iter, TreeColumn.CROP_LEFT, mf.CropL.to_string());
+			store.set(iter, TreeColumn.CROP_RIGHT, mf.CropR.to_string());
+			store.set(iter, TreeColumn.CROP_TOP, mf.CropT.to_string());
+			store.set(iter, TreeColumn.CROP_BOTTOM, mf.CropB.to_string());
+			store.set(iter, TreeColumn.START_POS, "%.1f".printf(mf.StartPos));
+			store.set(iter, TreeColumn.END_POS, "%.1f".printf(mf.EndPos));
+		}
+
+		tvFiles.set_model (store);
+		
+		tvFiles.columns_autosize();
+
+		if (action == "crop"){
+			colCropL.visible = true;
+			colCropR.visible = true;
+			colCropT.visible = true;
+			colCropB.visible = true;
+			colStartPos.visible = false;
+			colEndPos.visible = false;
+		}
+		else if (action == "trim"){
+			colCropL.visible = false;
+			colCropR.visible = false;
+			colCropT.visible = false;
+			colCropB.visible = false;
+			colStartPos.visible = true;
+			colEndPos.visible = true;
+		}
+	}
+
+	private void btnCropAuto_clicked(){
+		TreeSelection selection = tvFiles.get_selection();
+		if (selection.count_selected_rows() == 0){
+			string title = _("No Files Selected");
+			string msg = _("Select some files from the list");
+			gtk_messagebox(title,msg,this,true);
+			return;
+		}
+
+		var status_msg = _("Detecting borders...");
+		var dlg = new SimpleProgressWindow.with_parent(this, status_msg);
+		dlg.set_title(status_msg);
+		dlg.show_all();
+		gtk_do_events();
+		
+		TreeModel model;
+		GLib.List<TreePath> lst = selection.get_selected_rows (out model);
+
+		App.progress_total = (int) lst.length();
+		App.progress_count = 0;
+		
+		for(int k=0; k<lst.length(); k++){
+			TreePath path = lst.nth_data (k);
+			TreeIter iter;
+			model.get_iter (out iter, path);
+			MediaFile mf;
+			model.get (iter, 0, out mf, -1);
+
+			SelectedFile = mf;
+
+			try {
+				crop_detect_is_running = true;
+				Thread.create<void> (ffmpeg_crop_detect_thread, true);
+			} catch (ThreadError e) {
+				crop_detect_is_running = false;
+				log_error (e.message);
+			}
+
+			//dlg.pulse_start();
+			dlg.update_message("File: %s".printf(mf.Name));
+			while (crop_detect_is_running) {
+				dlg.update_progressbar();
+				dlg.sleep(200);
+				gtk_do_events();
+			}
+			App.progress_count++;
+
+			var store = (Gtk.ListStore) model;
+			store.set(iter, TreeColumn.CROP_LEFT, mf.CropL.to_string());
+			store.set(iter, TreeColumn.CROP_RIGHT, mf.CropR.to_string());
+			store.set(iter, TreeColumn.CROP_TOP, mf.CropT.to_string());
+			store.set(iter, TreeColumn.CROP_BOTTOM, mf.CropB.to_string());
+
+			gtk_do_events();
+		}
+
+		dlg.destroy();
+	}
+
+	private void ffmpeg_crop_detect_thread() {
+		SelectedFile.crop_detect();
+		crop_detect_is_running = false;
+	}
+
+	private void btnCropReset_clicked(){
+		TreeSelection selection = tvFiles.get_selection();
+		if (selection.count_selected_rows() == 0){
+			string title = _("No Files Selected");
+			string msg = _("Select some files from the list");
+			gtk_messagebox(title,msg,this,true);
+			return;
+		}
+
+		TreeModel model;
+		GLib.List<TreePath> lst = selection.get_selected_rows (out model);
+
+		for(int k=0; k<lst.length(); k++){
+			TreePath path = lst.nth_data (k);
+			TreeIter iter;
+			model.get_iter (out iter, path);
+			MediaFile mf;
+			model.get (iter, 0, out mf, -1);
+			mf.CropL = mf.CropR = mf.CropT = mf.CropB = 0;
+
+			var store = (Gtk.ListStore) model;
+			store.set(iter, TreeColumn.CROP_LEFT, mf.CropL.to_string());
+			store.set(iter, TreeColumn.CROP_RIGHT, mf.CropR.to_string());
+			store.set(iter, TreeColumn.CROP_TOP, mf.CropT.to_string());
+			store.set(iter, TreeColumn.CROP_BOTTOM, mf.CropB.to_string());
+		}
+	}
+	
+	private void btnOk_clicked(){
+		destroy();
+	}
+
+	private enum TreeColumn{
+		FILE_REF,
+		CROP_LEFT,
+		CROP_RIGHT,
+		CROP_TOP,
+		CROP_BOTTOM,
+		START_POS,
+		END_POS
+	}
+}
+
+

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);
+				encoderList.add(PrimaryEncoder);
 				if (audio.get_boolean_member("soxEnabled")){
 					encoderList.add("sox");
 				};
@@ -1535,6 +1555,229 @@
 		return encoderList;
 	}
 
+	//decode -----------------
+	
+	private string decode_video_avconv (MediaFile mf, Json.Object settings, bool silent, bool resample = true, bool crop = true, bool scale = true){
+		string s = "";
+
+		//Json.Object general = (Json.Object) settings.get_object_member("general");
+		//Json.Object video = (Json.Object) settings.get_object_member("video");
+		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		//Json.Object subs = (Json.Object) settings.get_object_member("subtitle");
+
+		s += PrimaryEncoder;
+
+		//progress info
+		if (silent){
+			s += " -nostats";
+		}
+
+		//seek input
+		if ((mf.StartPos > 0) && (mf.clip_list.size == 0)){
+			s += " -ss %.1f".printf(mf.StartPos);
+		}
+
+		//input
+		s += " -i \"${inFile}\"";
+
+		//stop output
+		if ((mf.EndPos > 0) && (mf.clip_list.size == 0)){
+			s += " -to %.1f".printf(mf.EndPos - mf.StartPos);
+		}
+
+		//format
+		s += " -copyinkf -f rawvideo -vcodec rawvideo -pix_fmt yuv420p";
+
+		//avconv_filters (resample, crop, resize, trim)
+		s += avconv_filters(mf,settings, true, false, resample, crop, scale);
+
+		//output
+		s += " -an -sn -y - | ";
+
+		return s;
+	}
+
+	private string decode_audio_avconv(MediaFile mf, Json.Object settings, bool silent, string temp_file_name = ""){
+		string s = "";
+
+		Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		string acodec = audio.get_string_member("codec");
+		bool sox_enabled = audio.get_boolean_member("soxEnabled");
+
+		s += PrimaryEncoder;
+
+		//progress info
+		if (silent){
+			s += " -nostats";
+		}
+		else{
+			s += " -stats";
+		}
+
+		//seek input
+		if ((mf.StartPos > 0) && (mf.clip_list.size == 0)){
+			s += " -ss %.1f".printf(mf.StartPos);
+		}
+		
+		//input
+		s += " -i \"${inFile}\"";
+
+		//stop output
+		if ((mf.EndPos > 0) && (mf.clip_list.size == 0)){
+			s += " -to %.1f".printf(mf.EndPos - mf.StartPos);
+		}
+
+		//format
+		s += " -f " + ((sox_enabled) ? "aiff" : "wav");
+		s += " -acodec pcm_s16le";
+
+		//channels
+		string channels = audio.get_string_member("channels");
+		if (channels == "disable"){
+			if (acodec == "mp3lame" && mf.AudioChannels > 2){
+				s += " -ac 2";
+				log_msg ("Downmixing to stereo, LAME does not support more than 2 channels");
+			}
+		}
+		else{
+			s += " -ac " + channels;
+		}
+
+		//sampling
+		string sampling = audio.get_string_member("samplingRate");
+		if (sampling != "disable"){
+			s += " -ar " + sampling;
+		}
+
+		//avconv_filters (trim)
+		s += avconv_filters(mf,settings, false, true);
+
+		//output
+		s += " -vn";
+
+		if (sox_enabled){
+			s += " -y - | ";
+			s += process_audio_sox(mf,settings,temp_file_name);
+		}
+		else{
+			if (temp_file_name.length > 0){
+				s += " -y '%s'".printf(temp_file_name);
+				s += "\n";
+			}
+			else{
+				s += " -y - | ";
+			}
+		}
+
+		return s;
+	}
+
+	//encode video -------------------
+	
+	private string encode_video_avconv (MediaFile mf, Json.Object settings){
+		string s = "";
+
+		Json.Object general = (Json.Object) settings.get_object_member("general");
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		string vcodec = video.get_string_member("codec");
+		string format = general.get_string_member("format");
+
+		s += PrimaryEncoder;
+
+		//seek input
+		if (mf.StartPos > 0){
+			s += " -ss %.1f".printf(mf.StartPos);
+		}
+		
+		s += " -i \"${inFile}\"";
+
+		//stop output
+		if ((mf.EndPos > 0) && (mf.clip_list.size == 0)){
+			s += " -to %.1f".printf(mf.EndPos - mf.StartPos);
+		}
+
+		s += " -f " + format;
+
+		switch(vcodec){
+			case "vp8":
+			s	 += " -c:v libvpx";
+				break;
+			case "vp9":
+				s += " -c:v libvpx-" + vcodec;
+				break;
+		}
+
+		if (video.get_string_member("mode") == "2pass"){
+			s += " -pass {passNumber}";
+		}
+
+		string vquality = "%.0f".printf(double.parse(video.get_string_member("quality")));
+		switch(video.get_string_member("mode")){
+			case "vbr":
+			case "2pass":
+				s += " -b:v " + video.get_string_member("bitrate") + "k";
+				break;
+			case "cbr":
+				s += " -b:v " + video.get_string_member("bitrate") + "k";
+				s += " -minrate " + video.get_string_member("bitrate") + "k";
+				s += " -maxrate " + video.get_string_member("bitrate") + "k";
+				break;
+			case "cq":
+				s += " -crf " + vquality;
+				s += " -qmin " + vquality;
+				s += " -qmax " + vquality;
+				break;
+		}
+
+		switch(vcodec){
+			case "vp8":
+			case "vp9":
+				if (video.has_member("vpx_deadline")){
+					s += " -deadline " + video.get_string_member("vpx_deadline");
+				}
+				else{
+					s += " -deadline good";
+				}
+				if (video.has_member("vpx_speed")){
+					s += " -cpu-used " + video.get_string_member("vpx_speed");
+				}
+				else{
+					s += " -cpu-used 1";
+				}
+				break;
+		}
+
+		//---------------
+
+		//user options
+		if (video.get_string_member("options").strip() != "") {
+			s += " " + video.get_string_member("options").strip();
+		}
+
+		//avconv_filters (resample, crop, resize, trim)
+		s += avconv_filters(mf,settings,true,false);
+
+		//disable audio and subs
+		s += " -an -sn";
+
+		//output
+		s += " -y {outputFile}"; //no quotes
+
+		s += "\n";
+
+		if (video.get_string_member("mode") == "2pass"){
+			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
+			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
+			s = temp;
+		}
+		else{
+			s = s.replace("{outputFile}","\"${tempVideo}\"");
+		}
+
+		return s;
+	}
+
 	private string encode_video_x264 (MediaFile mf, Json.Object settings){
 		string s = "";
 
@@ -1668,6 +1911,16 @@
 		s += "ffmpeg2theora";
 		s += " \"${inFile}\"";
 
+		//TODO: Add support for multi-trim. Use ffmpeg for encoding theora?
+		
+		if (mf.StartPos > 0){
+			s += " --starttime %.1f".printf(mf.StartPos);
+		}
+
+		if (mf.EndPos > 0){
+			s += " --endtime %.1f".printf(mf.EndPos);
+		}
+		
 		switch(video.get_string_member("mode")){
 			case "vbr":
 				s += " --videoquality " + video.get_string_member("quality");
@@ -1750,298 +2003,33 @@
 		return s;
 	}
 
-	/*
-	private string encode_video_avconv (MediaFile mf, Json.Object settings)
-	{
-		string s = "";
+	//video functions -----------------------
+	
+	private bool calculate_video_resolution (MediaFile mf, Json.Object settings, out int OutputWidth, out int OutputHeight){
+		bool rescale = false;
 
-		Json.Object general = (Json.Object) settings.get_object_member("general");
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		OutputWidth = mf.SourceWidth;
+		OutputHeight = mf.SourceHeight;
 
-		s += AVEncoder;
-		s += " -i \"${inFile}\"";
-		s += " -f " + general.get_string_member("format");
-		s += " -an -sn -c:v libvpx";
+		Json.Object video = (Json.Object) settings.get_object_member("video");
 
-		if (video.get_string_member("mode") == "2pass"){
-			s += " -pass {passNumber}";
+		if (mf.crop_enabled()){
+			OutputWidth -= (mf.CropL + mf.CropR);
+ OutputHeight -= (mf.CropT + mf.CropB);
+ log_msg("Cropped: %.0fx%.0f".printf(OutputWidth,OutputHeight));
 		}
 
-		string kbps = video.get_string_member("bitrate");
-		switch(video.get_string_member("mode")){
-			case "vbr":
-			case "2pass":
-				s += " -b:v %sk".printf(kbps);
-				break;
-			case "cbr":
-				s += " -minrate %sk -maxrate %sk -b:v %sk".printf(kbps,kbps,kbps);
-				break;
-			case "cq":
-				s += " -crf %s".printf(video.get_string_member("quality"));
-				break;
-		}
+		int maxw = int.parse(video.get_string_member("frameWidth"));
+		int maxh = int.parse(video.get_string_member("frameHeight"));
+		double iw = OutputWidth;
+		double ow = iw;
+		double ih = OutputHeight;
+		double oh = ih;
 
-		s += " -deadline " + video.get_string_member("speed");
-
-		// filters ----------
-
-		//fps
-		if (video.get_string_member("fpsNum") != "0" && video.get_string_member("fpsDenom") != "0") {
-			s += " -r " + video.get_string_member("fpsNum") + "/" + video.get_string_member("fpsDenom");
-		}
-
-		string vf = "";
-
-		//cropping
-		if (mf.crop_enabled()) {
-			vf += ",crop=%s".printf(mf.crop_values_libav());
-		}
-
-		//resizing
-		int w,h;
-		bool rescale = calculate_video_resolution(mf, settings, out w, out h);
-		if (rescale) {
-			vf += ",scale=%d:%d".printf(w,h);
-		}
-
-		if (vf.length > 0){
-			s += " -vf " + vf[1:vf.length];
-		}
-
-		//---------------
-
-		//other options
-		if (video.get_string_member("options").strip() != "") {
-			s += " " + video.get_string_member("options").strip();
-		}
-
-		//add output file path placeholder
-		s += " -y {outputFile}";
-
-		s += "\n";
-
-		if (video.get_string_member("mode") == "2pass"){
-			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
-			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
-			s = temp;
-		}
-		else
-		{
-			s = s.replace("{outputFile}","\"${tempVideo}\"");
-		}
-
-		return s;
-	}
-*/
-
-	/*
-	 * private string encode_video_vpxenc (MediaFile mf, Json.Object settings){
-		string s = "";
-
-		//Json.Object general = (Json.Object) settings.get_object_member("general");
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
-		string vcodec = video.get_string_member("codec");
-
-		s += decode_video_avconv(mf,settings,true);
-		s += "vpxenc";
-		s += " --codec=" + vcodec;
-
-		if (video.get_string_member("mode") == "2pass"){
-			s += " --passes=2 --pass={passNumber} --fpf=stats";
-		}
-		else{
-			s += " --passes=1";
-		}
-
-		string vquality = "%.0f".printf(double.parse(video.get_string_member("quality")));
-		switch(video.get_string_member("mode")){
-			case "vbr":
-			case "2pass":
-				s += " --end-usage=vbr --target-bitrate=" + video.get_string_member("bitrate");
-				break;
-			case "cbr":
-				s += " --end-usage=cbr --target-bitrate=" + video.get_string_member("bitrate");
-				break;
-			case "cq":
-				s += " --end-usage=cq --cq-level=" + vquality;
-				break;
-		}
-
-		s += " --good";
-		switch(video.get_string_member("speed")){
-			case "good_0":
-				s += " --cpu-used=0";
-				break;
-			case "good_1":
-				s += " --cpu-used=1";
-				break;
-			case "good_2":
-				s += " --cpu-used=2";
-				break;
-			case "good_3":
-				s += " --cpu-used=3";
-				break;
-			case "good_4":
-				s += " --cpu-used=4";
-				break;
-			case "good_5":
-				s += " --cpu-used=5";
-				break;
-		}
-
-		//---------------
-
-		//other options
-		if (video.get_string_member("options").strip() != "") {
-			s += " " + video.get_string_member("options").strip();
-		}
-
-		//specify input dimensions (required)
-		int w,h;
-		calculate_video_resolution(mf, settings, out w, out h);
-		s += " --width=%d --height=%d".printf(w,h);
-
-		//output
-		s += " -o {outputFile}";
-
-		//input
-		s += " -";
-
-		s += "\n";
-
-		if (video.get_string_member("mode") == "2pass"){
-			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
-			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
-			s = temp;
-		}
-		else
-		{
-			s = s.replace("{outputFile}","\"${tempVideo}\"");
-		}
-
-		return s;
-	}*/
-
-	private string encode_video_avconv (MediaFile mf, Json.Object settings){
-		string s = "";
-
-		Json.Object general = (Json.Object) settings.get_object_member("general");
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
-		string vcodec = video.get_string_member("codec");
-		string format = general.get_string_member("format");
-
-		s += AVEncoder;
-		s += " -i \"${inFile}\"";
-		s += " -f " + format;
-
-		switch(vcodec){
-			case "vp8":
-			s	 += " -c:v libvpx";
-				break;
-			case "vp9":
-				s += " -c:v libvpx-" + vcodec;
-				break;
-		}
-
-		if (video.get_string_member("mode") == "2pass"){
-			s += " -pass {passNumber}";
-		}
-
-		string vquality = "%.0f".printf(double.parse(video.get_string_member("quality")));
-		switch(video.get_string_member("mode")){
-			case "vbr":
-			case "2pass":
-				s += " -b:v " + video.get_string_member("bitrate") + "k";
-				break;
-			case "cbr":
-				s += " -b:v " + video.get_string_member("bitrate") + "k";
-				s += " -minrate " + video.get_string_member("bitrate") + "k";
-				s += " -maxrate " + video.get_string_member("bitrate") + "k";
-				break;
-			case "cq":
-				s += " -crf " + vquality;
-				s += " -qmin " + vquality;
-				s += " -qmax " + vquality;
-				break;
-		}
-
-		switch(vcodec){
-			case "vp8":
-			case "vp9":
-				if (video.has_member("vpx_deadline")){
-					s += " -deadline " + video.get_string_member("vpx_deadline");
-				}
-				else{
-					s += " -deadline good";
-				}
-				if (video.has_member("vpx_speed")){
-					s += " -cpu-used " + video.get_string_member("vpx_speed");
-				}
-				else{
-					s += " -cpu-used 1";
-				}
-				break;
-		}
-
-		//---------------
-
-		//user options
-		if (video.get_string_member("options").strip() != "") {
-			s += " " + video.get_string_member("options").strip();
-		}
-
-		//resample, crop and resize
-		s += avconv_vf_options(mf,settings);
-
-		//disable audio and subs
-		s += " -an -sn";
-
-		//output
-		s += " -y {outputFile}"; //no quotes
-
-		s += "\n";
-
-		if (video.get_string_member("mode") == "2pass"){
-			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
-			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
-			s = temp;
-		}
-		else
-		{
-			s = s.replace("{outputFile}","\"${tempVideo}\"");
-		}
-
-		return s;
-	}
-
-	private bool calculate_video_resolution (MediaFile mf, Json.Object settings, out int OutputWidth, out int OutputHeight){
-		bool rescale = false;
-
-		OutputWidth = mf.SourceWidth;
-		OutputHeight = mf.SourceHeight;
-
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-
-		if (mf.crop_enabled()){
-			OutputWidth -= (mf.CropL + mf.CropR);
- OutputHeight -= (mf.CropT + mf.CropB);
- log_msg("Cropped: %.0fx%.0f".printf(OutputWidth,OutputHeight));
-		}
-
-		int maxw = int.parse(video.get_string_member("frameWidth"));
-		int maxh = int.parse(video.get_string_member("frameHeight"));
-		double iw = OutputWidth;
-		double ow = iw;
-		double ih = OutputHeight;
-		double oh = ih;
-
-		//flags for checking if resizing is actually required
-		bool noResize = false;
-		bool isUpscale = false;
-		bool isSameSize = false;
+		//flags for checking if resizing is actually required
+		bool noResize = false;
+		bool isUpscale = false;
+		bool isSameSize = false;
 
 		if (maxw == 0 && maxh == 0) {
 			//do nothing
@@ -2108,17 +2096,292 @@
 			isSameSize = true;
 		}
 
-		if (noResize || isUpscale || isSameSize) {
-			//do not resize
-			return false;
+		if (noResize || isUpscale || isSameSize) {
+			//do not resize
+			return false;
+		}
+		else {
+			//resize
+			OutputWidth = (int) ow;
+			OutputHeight = (int) oh;
+			log_msg("Resized: %.0fx%.0f".printf(ow,oh));
+			return true;
+		}
+	}
+
+	private string avconv_filters (MediaFile mf, Json.Object settings, bool keepVideo, bool keepAudio, bool resample = true, bool crop = true, bool scale = true){
+		string s = "";
+		string filters = "";
+
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+
+		//trim
+		string map = "";
+		string vf_trim = "";
+		avconv_vf_options_trim(mf, settings, keepVideo, keepAudio, out vf_trim, out map);
+		//filters = vf_trim;
+		
+		if (keepVideo){
+			//resample
+			if (resample){
+				int fpsNum = int.parse(video.get_string_member("fpsNum"));
+				int fpsDenom = int.parse(video.get_string_member("fpsDenom"));
+				if (fpsNum != 0 && fpsDenom != 0) {
+					s += " -r %d/%d".printf(fpsNum,fpsDenom);
+					mf.OutputFrameCount = (long)((mf.Duration / 1000.0) * ((float)fpsNum/fpsDenom));
+				}
+			}
+
+			//crop
+			if (crop){
+				if (mf.crop_enabled()) {
+					if (filters.length == 0){
+						if (vf_trim.length == 0){
+							filters += "[0:v]";
+						}
+						else {
+							filters += ";[vout]";
+						}
+					}
+
+					filters += "crop=%s".printf(mf.crop_values_libav());
+				}
+			}
+
+			//scale
+			if (scale){
+				int w,h;
+				bool rescale = calculate_video_resolution(mf, settings, out w, out h);
+				if (rescale) {
+					if (filters.length == 0){
+						if (vf_trim.length == 0){
+							filters += "[0:v]";
+						}
+						else {
+							filters += ";[vout]";
+						}
+					}
+					else{
+						filters += ",";
+					}
+					
+					filters += "scale=%d:%d".printf(w,h);
+				}
+			}
+
+			if ((vf_trim.length > 0) && (filters.length > 0)){
+				filters += "[vout]";
+			}
+		}
+
+		filters = vf_trim + filters;
+		
+		if (filters.length > 0){
+			s = " -filter_complex \"%s\"".printf(filters);
+
+			if (map.length > 0){
+				s += map;
+			}
+		}
+
+		return s;
+	}
+
+	private void avconv_vf_options_trim (MediaFile mf, Json.Object settings, bool keepVideo, bool keepAudio, out string vf_trim, out string map){
+		string s = "";
+		vf_trim = "";
+		map = "";
+		
+		if (mf.clip_list.size == 0){
+			return;
+		}
+
+		string af = "";
+		string audio_clips = "";
+		string vf = "";
+		string video_clips = "";
+
+		//Json.Object general = (Json.Object) settings.get_object_member("general");
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+		Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		string acodec = audio.get_string_member("codec");
+		string vcodec = video.get_string_member("codec");
+		//string format = general.get_string_member("format");
+		
+		if (keepVideo && mf.HasVideo && (vcodec != "disable")) {
+			int index = 0;
+			foreach(MediaClip clip in mf.clip_list){
+				index++;
+				vf += "[0:v]trim=start=%.3f:end=%.3f,setpts=PTS-STARTPTS[v%d];".printf(clip.StartPos, clip.EndPos, index);
+				video_clips += "[v%d]".printf(index);
+			}
+		}
+
+		if (keepAudio && mf.HasAudio && (acodec != "disable")) {
+			int index = 0;
+			foreach(MediaClip clip in mf.clip_list){
+				index++;
+				af += "[0:a]atrim=start=%.3f:end=%.3f,asetpts=PTS-STARTPTS[a%d];".printf(clip.StartPos, clip.EndPos, index);
+				audio_clips += "[a%d]".printf(index);
+			}
+		}
+
+		if ((vf.length > 0) && (af.length > 0)){
+			s += vf;
+			s += af;
+			s += "%s%sconcat=n=%d:v=%d:a=%d[vout][aout]".printf(video_clips, audio_clips, mf.clip_list.size, 1, 1);
+			map = " -map '[vout]' -map '[aout]' -strict -2";
+		}
+		else if (vf.length > 0){
+			s += vf;
+			s += "%s%sconcat=n=%d:v=%d:a=%d[vout]".printf(video_clips, "", mf.clip_list.size, 1, 0);
+			map = " -map '[vout]' -strict -2";
+		}
+		else if (af.length > 0){
+			s += af;
+			s += "%s%sconcat=n=%d:v=%d:a=%d[aout]".printf("", audio_clips, mf.clip_list.size, 0, 1);
+			map = " -map '[aout]' -strict -2";
+		}
+
+		vf_trim = s;
+	}
+
+	//encode audio ------------------------
+	
+	private string encode_audio_avconv (MediaFile mf, Json.Object settings){
+		string s = "";
+
+		Json.Object general = (Json.Object) settings.get_object_member("general");
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+		Json.Object audio = (Json.Object) settings.get_object_member("audio");
+
+		string format = general.get_string_member("format");
+		bool sox_enabled = audio.get_boolean_member("soxEnabled");
+
+		if (sox_enabled){
+			s += decode_audio_avconv(mf, settings, true);
+			s += PrimaryEncoder;
+			s += " -i -";
+		}
+		else{
+			s += PrimaryEncoder;
+			
+			//seek input
+			if ((mf.StartPos > 0) && (mf.clip_list.size == 0)){
+				s += " -ss %.1f".printf(mf.StartPos);
+			}
+			
+			s += " -i \"${inFile}\"";
+
+			//stop output
+			if ((mf.EndPos > 0) && (mf.clip_list.size == 0)){
+				s += " -to %.1f".printf(mf.EndPos - mf.StartPos);
+			}
+
+			//avconv_filters (trim)
+			s += avconv_filters(mf,settings, false, true);
+		}
+
+		switch (format){
+		case "ac3":
+			s += " -f ac3 -acodec ac3";
+			s += " -b:a " + audio.get_string_member("bitrate") + "k";
+			break;
+		case "flac":
+			s += " -f flac -acodec flac";
+			break;
+		case "wav":
+			s += " -f wav";
+			s += " -acodec " + audio.get_string_member("codec");
+			break;
+		default:
+			string acodec = audio.get_string_member("codec");
+			switch(acodec){
+			case "aac": //if aac
+			case "neroaac": //if aac
+			case "libfdk_aac":
+				s += " -f mp4 -acodec %s".printf(acodec);
+				s += " -strict experimental"; //for compatibility with older versions; not required with newer versions where 'aac' is marked as stable.
+				switch (audio.get_string_member("mode")){
+				case "vbr":
+					s += " -q:a " + audio.get_string_member("quality");
+					break;
+				case "abr":
+					s += " -b:a " + audio.get_string_member("bitrate") + "k";
+					break;
+				}
+				if (audio.has_member("aacProfile")){
+					switch(audio.get_string_member("aacProfile")){
+					case "auto":
+						//do nothing
+						break;
+					case "lc":
+						s += " -profile aac_low";
+						break;
+					case "he":
+						s += " -profile aac_he";
+						break;
+					case "hev2":
+						s += " -profile aac_he_v2";
+						break;
+					case "ld":
+						s += " -profile aac_ld";
+						break;
+					case "eld":
+						s += " -profile aac_eld";
+						break;
+					case "mpeg2_lc":
+						s += " -profile mpeg2_aac_low";
+						break;
+					case "mpeg2_he":
+						s += " -profile mpeg2_aac_he";
+						break;
+					case "mpeg2_hev2":
+						//not supported
+						break;
+					}
+				}
+				break;
+			}
+			break;
+		}
+
+		//channels
+		string channels = audio.get_string_member("channels");
+		if (channels != "disable"){
+			s += " -ac " + channels;
+		}
+
+		//sampling
+		string sampling = audio.get_string_member("samplingRate");
+		if (sampling != "disable"){
+			s += " -ar " + sampling;
+		}
+
+		//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}\"" : "";
+
+		s += " -vn -sn";
+
+		//output
+		if (mf.HasVideo && video.get_string_member("codec") != "disable") {
+			//encode to tempAudio
+			s += " -y \"${tempAudio}\"";
 		}
 		else {
-			//resize
-			OutputWidth = (int) ow;
-			OutputHeight = (int) oh;
-			log_msg("Resized: %.0fx%.0f".printf(ow,oh));
-			return true;
+			//encode to outputFile
+			s += " -y \"${outputFile}\"";
 		}
+
+		s += "\n";
+		
+		return s;
 	}
 
 	private string encode_audio_mp3lame (MediaFile mf, Json.Object settings){
@@ -2366,313 +2629,63 @@
 		return s;
 	}
 
-	private string encode_audio_avconv (MediaFile mf, Json.Object settings){
-		string s = "";
-
-		Json.Object general = (Json.Object) settings.get_object_member("general");
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-		Json.Object audio = (Json.Object) settings.get_object_member("audio");
-
-		string format = general.get_string_member("format");
-		bool sox_enabled = audio.get_boolean_member("soxEnabled");
-
-		if (sox_enabled){
-			s += decode_audio_avconv(mf, settings, true);
-			s += AVEncoder;
-			s += " -i -";
-		}
-		else{
-			s += AVEncoder;
-			s += " -i \"${inFile}\"";
-		}
-
-		switch (format){
-		case "ac3":
-			s += " -f ac3 -acodec ac3";
-			s += " -b:a " + audio.get_string_member("bitrate") + "k";
-			break;
-		case "flac":
-			s += " -f flac -acodec flac";
-			break;
-		case "wav":
-			s += " -f wav";
-			s += " -acodec " + audio.get_string_member("codec");
-			break;
-		default:
-			string acodec = audio.get_string_member("codec");
-			switch(acodec){
-			case "aac": //if aac
-			case "neroaac": //if aac
-			case "libfdk_aac":
-				s += " -f mp4 -acodec %s".printf(acodec);
-				s += " -strict experimental"; //for compatibility with older versions; not required with newer versions where 'aac' is marked as stable.
-				switch (audio.get_string_member("mode")){
-				case "vbr":
-					s += " -q:a " + audio.get_string_member("quality");
-					break;
-				case "abr":
-					s += " -b:a " + audio.get_string_member("bitrate") + "k";
-					break;
-				}
-				if (audio.has_member("aacProfile")){
-					switch(audio.get_string_member("aacProfile")){
-					case "auto":
-						//do nothing
-						break;
-					case "lc":
-						s += " -profile aac_low";
-						break;
-					case "he":
-						s += " -profile aac_he";
-						break;
-					case "hev2":
-						s += " -profile aac_he_v2";
-						break;
-					case "ld":
-						s += " -profile aac_ld";
-						break;
-					case "eld":
-						s += " -profile aac_eld";
-						break;
-					case "mpeg2_lc":
-						s += " -profile mpeg2_aac_low";
-						break;
-					case "mpeg2_he":
-						s += " -profile mpeg2_aac_he";
-						break;
-					case "mpeg2_hev2":
-						//not supported
-						break;
-					}
-				}
-				break;
-			}
-			break;
-		}
-
-		//channels
-		string channels = audio.get_string_member("channels");
-		if (channels != "disable"){
-			s += " -ac " + channels;
-		}
-
-		//sampling
-		string sampling = audio.get_string_member("samplingRate");
-		if (sampling != "disable"){
-			s += " -ar " + sampling;
-		}
-
-		//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}\"" : "";
-
-		s += " -vn -sn";
-
-		//output
-		if (mf.HasVideo && video.get_string_member("codec") != "disable") {
-			//encode to tempAudio
-			s += " -y \"${tempAudio}\"";
-		}
-		else {
-			//encode to outputFile
-			s += " -y \"${outputFile}\"";
-		}
-
-		s += "\n";
-		
-		return s;
-	}
-
 	private string encode_audio_oggenc (MediaFile mf, Json.Object settings){
 		string s = "";
 
 		//Json.Object general = (Json.Object) settings.get_object_member("general");
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-		Json.Object audio = (Json.Object) settings.get_object_member("audio");
-		Json.Object subs = (Json.Object) settings.get_object_member("subtitle");
-
-		s += decode_audio_avconv(mf, settings, false);
-		s += "oggenc --quiet";
-
-		//mode
-		switch (audio.get_string_member("mode")){
-			case "vbr":
-				s += " --bitrate " + audio.get_string_member("bitrate");
-				break;
-			case "abr":
-				s += " --quality " + audio.get_string_member("quality");
-				break;
-		}
-
-		//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}'" : "";
-
-		//subs
-		if (subs.get_string_member("mode") == "embed") {
-			if (mf.SubExt == ".srt" || mf.SubExt == ".lrc") {
-				s += " --lyrics \"${subFile}\"";
-			}
-		}
-
-		//output
-		if (mf.HasVideo && video.get_string_member("codec") != "disable") {
-			//encode to tempAudio
-			s += " --output \"${tempAudio}\"";
-		}
-		else {
-			//encode to outputFile
-			s += " --output \"${outputFile}\"";
-		}
-
-		//input
-		s += " -";
-
-		s += "\n";
-
-		return s;
-	}
-
-	private string decode_video_avconv (MediaFile mf, Json.Object settings, bool silent, bool resample = true, bool crop = true, bool scale = true){
-		string s = "";
-
-		//Json.Object general = (Json.Object) settings.get_object_member("general");
-		//Json.Object video = (Json.Object) settings.get_object_member("video");
-		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
-		//Json.Object subs = (Json.Object) settings.get_object_member("subtitle");
-
-		s += AVEncoder;
-
-		//progress info
-		if (silent){
-			s += " -nostats";
-		}
-		//input
-		s += " -i \"${inFile}\"";
-
-		//format
-		s += " -copyinkf -f rawvideo -vcodec rawvideo -pix_fmt yuv420p";
-
-		//framerate, crop and resize
-		s += avconv_vf_options(mf,settings, resample, crop, scale);
-
-		//output
-		s += " -an -sn -y - | ";
-
-		return s;
-	}
-
-	private string avconv_vf_options (MediaFile mf, Json.Object settings, bool resample = true, bool crop = true, bool scale = true){
-		string s = "";
-		string vf = "";
-
-		Json.Object video = (Json.Object) settings.get_object_member("video");
-
-		//resample
-		if (resample){
-			int fpsNum = int.parse(video.get_string_member("fpsNum"));
-			int fpsDenom = int.parse(video.get_string_member("fpsDenom"));
-			if (fpsNum != 0 && fpsDenom != 0) {
-				s += " -r %d/%d".printf(fpsNum,fpsDenom);
-				mf.OutputFrameCount = (long)((mf.Duration / 1000.0) * ((float)fpsNum/fpsDenom));
-			}
-		}
-
-		//crop
-		if (crop){
-			if (mf.crop_enabled()) {
-				vf += ",crop=%s".printf(mf.crop_values_libav());
-			}
-		}
-
-		//scale
-		if (scale){
-			int w,h;
-			bool rescale = calculate_video_resolution(mf, settings, out w, out h);
-			if (rescale) {
-				vf += ",scale=%d:%d".printf(w,h);
-			}
-		}
-
-		if (vf.length > 0){
-			s += " -vf " + vf[1:vf.length];
-		}
-
-		return s;
-	}
-
-	private string decode_audio_avconv(MediaFile mf, Json.Object settings, bool silent, string temp_file_name = ""){
-		string s = "";
-
+		Json.Object video = (Json.Object) settings.get_object_member("video");
 		Json.Object audio = (Json.Object) settings.get_object_member("audio");
-		string acodec = audio.get_string_member("codec");
-		bool sox_enabled = audio.get_boolean_member("soxEnabled");
+		Json.Object subs = (Json.Object) settings.get_object_member("subtitle");
 
-		s += AVEncoder;
+		s += decode_audio_avconv(mf, settings, false);
+		s += "oggenc --quiet";
 
-		//progress info
-		if (silent){
-			s += " -nostats";
-		}
-		else{
-			s += " -stats";
+		//mode
+		switch (audio.get_string_member("mode")){
+			case "vbr":
+				s += " --bitrate " + audio.get_string_member("bitrate");
+				break;
+			case "abr":
+				s += " --quality " + audio.get_string_member("quality");
+				break;
 		}
 
-		//input
-		s += " -i \"${inFile}\"";
-
-		//format
-		s += " -f " + ((sox_enabled) ? "aiff" : "wav");
-		s += " -acodec pcm_s16le";
+		//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}'" : "";
 
-		//channels
-		string channels = audio.get_string_member("channels");
-		if (channels == "disable"){
-			if (acodec == "mp3lame" && mf.AudioChannels > 2){
-				s += " -ac 2";
-				log_msg ("Downmixing to stereo, LAME does not support more than 2 channels");
+		//subs
+		if (subs.get_string_member("mode") == "embed") {
+			if (mf.SubExt == ".srt" || mf.SubExt == ".lrc") {
+				s += " --lyrics \"${subFile}\"";
 			}
 		}
-		else{
-			s += " -ac " + channels;
-		}
-
-		//sampling
-		string sampling = audio.get_string_member("samplingRate");
-		if (sampling != "disable"){
-			s += " -ar " + sampling;
-		}
 
 		//output
-		s += " -vn";
-
-		if (sox_enabled){
-			s += " -y - | ";
-			s += process_audio_sox(mf,settings,temp_file_name);
+		if (mf.HasVideo && video.get_string_member("codec") != "disable") {
+			//encode to tempAudio
+			s += " --output \"${tempAudio}\"";
 		}
-		else{
-			if (temp_file_name.length > 0){
-				s += " -y '%s'".printf(temp_file_name);
-				s += "\n";
-			}
-			else{
-				s += " -y - | ";
-			}
+		else {
+			//encode to outputFile
+			s += " --output \"${outputFile}\"";
 		}
 
+		//input
+		s += " -";
+
+		s += "\n";
+
 		return s;
 	}
 
+	//audio functions -----------------------
+
 	private string process_audio_sox(MediaFile mf, Json.Object settings, string temp_file_name = ""){
 		string s = "";
 
@@ -2735,6 +2748,8 @@
 		return s;
 	}
 
+	//muxing -------------------------------------
+	
 	private string mux_mkvmerge (MediaFile mf, Json.Object settings){
 		string s = "";
 
@@ -2827,7 +2842,7 @@
 		Json.Object audio = (Json.Object) settings.get_object_member("audio");
 		string format = general.get_string_member("format");
 
-		s += AVEncoder;
+		s += PrimaryEncoder;
 		if (mf.HasAudio && audio.get_string_member("codec") != "disable") {
 			s += " -i \"${tempAudio}\"";
 		}
@@ -2848,12 +2863,13 @@
 		return s;
 	}
 
+	/*
 	private string mux_avconv_aac_to_mp4 (string input_file, string output_file){
 		//Warning: Produces MP4 audio that cannot be read by MKVMerge
 		
 		string s = "";
 
-		s += AVEncoder;
+		s += PrimaryEncoder;
 		s += " -i %s".printf(input_file);
 		s += " -f mp4";
 		s += " -c:a copy -vn -sn";
@@ -2862,7 +2878,179 @@
 		
 		return s;
 	}
-	
+
+
+	private string encode_video_avconv (MediaFile mf, Json.Object settings)
+	{
+		string s = "";
+
+		Json.Object general = (Json.Object) settings.get_object_member("general");
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
+
+		s += AVEncoder;
+		s += " -i \"${inFile}\"";
+		s += " -f " + general.get_string_member("format");
+		s += " -an -sn -c:v libvpx";
+
+		if (video.get_string_member("mode") == "2pass"){
+			s += " -pass {passNumber}";
+		}
+
+		string kbps = video.get_string_member("bitrate");
+		switch(video.get_string_member("mode")){
+			case "vbr":
+			case "2pass":
+				s += " -b:v %sk".printf(kbps);
+				break;
+			case "cbr":
+				s += " -minrate %sk -maxrate %sk -b:v %sk".printf(kbps,kbps,kbps);
+				break;
+			case "cq":
+				s += " -crf %s".printf(video.get_string_member("quality"));
+				break;
+		}
+
+		s += " -deadline " + video.get_string_member("speed");
+
+		// filters ----------
+
+		//fps
+		if (video.get_string_member("fpsNum") != "0" && video.get_string_member("fpsDenom") != "0") {
+			s += " -r " + video.get_string_member("fpsNum") + "/" + video.get_string_member("fpsDenom");
+		}
+
+		string vf = "";
+
+		//cropping
+		if (mf.crop_enabled()) {
+			vf += ",crop=%s".printf(mf.crop_values_libav());
+		}
+
+		//resizing
+		int w,h;
+		bool rescale = calculate_video_resolution(mf, settings, out w, out h);
+		if (rescale) {
+			vf += ",scale=%d:%d".printf(w,h);
+		}
+
+		if (vf.length > 0){
+			s += " -vf " + vf[1:vf.length];
+		}
+
+		//---------------
+
+		//other options
+		if (video.get_string_member("options").strip() != "") {
+			s += " " + video.get_string_member("options").strip();
+		}
+
+		//add output file path placeholder
+		s += " -y {outputFile}";
+
+		s += "\n";
+
+		if (video.get_string_member("mode") == "2pass"){
+			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
+			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
+			s = temp;
+		}
+		else
+		{
+			s = s.replace("{outputFile}","\"${tempVideo}\"");
+		}
+
+		return s;
+	}
+
+	private string encode_video_vpxenc (MediaFile mf, Json.Object settings){
+		string s = "";
+
+		//Json.Object general = (Json.Object) settings.get_object_member("general");
+		Json.Object video = (Json.Object) settings.get_object_member("video");
+		//Json.Object audio = (Json.Object) settings.get_object_member("audio");
+		string vcodec = video.get_string_member("codec");
+
+		s += decode_video_avconv(mf,settings,true);
+		s += "vpxenc";
+		s += " --codec=" + vcodec;
+
+		if (video.get_string_member("mode") == "2pass"){
+			s += " --passes=2 --pass={passNumber} --fpf=stats";
+		}
+		else{
+			s += " --passes=1";
+		}
+
+		string vquality = "%.0f".printf(double.parse(video.get_string_member("quality")));
+		switch(video.get_string_member("mode")){
+			case "vbr":
+			case "2pass":
+				s += " --end-usage=vbr --target-bitrate=" + video.get_string_member("bitrate");
+				break;
+			case "cbr":
+				s += " --end-usage=cbr --target-bitrate=" + video.get_string_member("bitrate");
+				break;
+			case "cq":
+				s += " --end-usage=cq --cq-level=" + vquality;
+				break;
+		}
+
+		s += " --good";
+		switch(video.get_string_member("speed")){
+			case "good_0":
+				s += " --cpu-used=0";
+				break;
+			case "good_1":
+				s += " --cpu-used=1";
+				break;
+			case "good_2":
+				s += " --cpu-used=2";
+				break;
+			case "good_3":
+				s += " --cpu-used=3";
+				break;
+			case "good_4":
+				s += " --cpu-used=4";
+				break;
+			case "good_5":
+				s += " --cpu-used=5";
+				break;
+		}
+
+		//---------------
+
+		//other options
+		if (video.get_string_member("options").strip() != "") {
+			s += " " + video.get_string_member("options").strip();
+		}
+
+		//specify input dimensions (required)
+		int w,h;
+		calculate_video_resolution(mf, settings, out w, out h);
+		s += " --width=%d --height=%d".printf(w,h);
+
+		//output
+		s += " -o {outputFile}";
+
+		//input
+		s += " -";
+
+		s += "\n";
+
+		if (video.get_string_member("mode") == "2pass"){
+			string temp = s.replace("{passNumber}","1").replace("{outputFile}","/dev/null");
+			temp += s.replace("{passNumber}","2").replace("{outputFile}","\"${tempVideo}\"");
+			s = temp;
+		}
+		else
+		{
+			s = s.replace("{outputFile}","\"${tempVideo}\"");
+		}
+
+		return s;
+	}*/
+
 }
 
 public class Encoder : GLib.Object{

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;
 				miFileRemove.visible = false;
 				break;
 
@@ -1785,6 +1834,7 @@
 				miFilePlaySource.visible = true;
 				miFilePlayOutput.visible = true;
 				miFileCropAuto.visible = false;
+				miFileTrim.visible = false;
 				miFileRemove.visible = false;
 				miFileSeparator1.visible = false;
 				miFileSeparator2.visible = true;
@@ -1842,7 +1892,7 @@
 			MediaFile mf = App.InputFiles[index];
 
 			if (file_exists(mf.OutputFilePath)){
-				MediaFile mfOutput = new MediaFile(mf.OutputFilePath, App.AVEncoder);
+				MediaFile mfOutput = new MediaFile(mf.OutputFilePath, App.PrimaryEncoder);
 				var window = new FileInfoWindow(mfOutput);
 				window.set_transient_for(this);
 				window.show_all();
@@ -1855,8 +1905,6 @@
 		TreeSelection selection = tvFiles.get_selection();
 		if (selection.count_selected_rows() != 1){ return; }
 
-		//set_busy (true,this);
-
 		TreeModel model;
 		GLib.List<TreePath> lst = selection.get_selected_rows (out model);
 
@@ -1866,24 +1914,31 @@
 			model.get_iter (out iter, path);
 			int index = int.parse (path.to_string());
 			MediaFile mf = App.InputFiles[index];
-			var win = new CropVideoSingleWindow(this, mf);
-			this.hide();
-			//win.show_all();
 
-			/*
-			if (file.crop_detect()){
-				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, file.crop_values_info());
-			}
-			else{
-				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, _("N/A"));
-			}
-			* */
-			break;
+			MediaPlayerWindow.CropVideo(mf, this);
 
-			do_events();
+			break;
 		}
+ }
+
+	private void miFileTrim_clicked() {
+		TreeSelection selection = tvFiles.get_selection();
+		if (selection.count_selected_rows() != 1){ return; }
 
-		//set_busy (false,this);
+		TreeModel model;
+		GLib.List<TreePath> lst = selection.get_selected_rows (out model);
+
+		for(int k=0; k<lst.length(); k++){
+			TreePath path = lst.nth_data (k);
+			TreeIter iter;
+			model.get_iter (out iter, path);
+			int index = int.parse (path.to_string());
+			MediaFile mf = App.InputFiles[index];
+			
+			MediaPlayerWindow.TrimFile(mf, this);
+
+			break;
+		}
 }
 
 private void miFileRemove_clicked() {
@@ -1935,10 +1990,6 @@
 		}
 	}
 
- private void do_events(){
-		while(Gtk.events_pending())
-			Gtk.main_iteration();
-	}
 
 private void miFilePlayOutput_clicked() {
 		TreeSelection selection = tvFiles.get_selection();
@@ -1950,7 +2001,7 @@
 			int index = int.parse (path.to_string());
 			MediaFile mf = App.InputFiles[index];
 
-			var mf_output = new MediaFile(mf.OutputFilePath, App.AVEncoder);
+			var mf_output = new MediaFile(mf.OutputFilePath, App.PrimaryEncoder);
 			MediaPlayerWindow.PlayFile(mf_output);
 		}
 }
@@ -1969,31 +2020,6 @@
 		}
 }
 
-	public void tvFiles_crop_cell_edited (string path, string new_text) {
-		int index = int.parse (path.to_string());
-		MediaFile mf = App.InputFiles[index];
-
-		if (new_text == null || new_text.length == 0){
-			mf.crop_reset();
-		}
-		else{
-			string[ ] arr = new_text.replace (" "," ").split (":");
-			if (arr.length == 4){
-				mf.CropL = int.parse(arr[0]);
-				mf.CropT = int.parse(arr[1]);
-				mf.CropR = int.parse(arr[2]);
-				mf.CropB = int.parse(arr[3]);
-				mf.CropW = mf.SourceWidth - mf.CropL - mf.CropR;
-				mf.CropH = mf.SourceHeight - mf.CropT - mf.CropB;
-			}
-		}
-
-		Gtk.ListStore model = (Gtk.ListStore) tvFiles.model;
-		TreeIter iter;
-		model.get_iter (out iter, new TreePath.from_string (path));
-		model.set (iter, InputField.FILE_CROPVAL, mf.crop_values_info());
-	}
-
 	// add files --------------------------------
 
 	private void select_items(bool select_files){
@@ -2289,6 +2315,45 @@
 		refresh_list_view();
 	}
 
+	private void btnCropVideos_clicked(){
+		if (App.InputFiles.size == 0){
+			string title = _("No Files");
+			string msg = _("Add some files to the file list");
+			gtk_messagebox(title, msg, this, true);
+			return;
+		}
+
+		int count = 0 ;
+		foreach(var mf in App.InputFiles){
+			if (mf.HasVideo){
+				count++;
+			}
+		}
+		
+		if (count == 0){
+			string title = _("No Videos");
+			string msg = _("Add some videos to the file list");
+			gtk_messagebox(title, msg, this, true);
+			return;
+		}
+
+		BatchEditWindow.CropVideos(this);
+		this.hide();
+	}
+
+	private void btnTrimDuration_clicked(){
+		if (App.InputFiles.size == 0){
+			string title = _("No Files");
+			string msg = _("Add some files to the file list");
+			gtk_messagebox(title, msg, this, true);
+			return;
+		}
+
+		BatchEditWindow.TrimFiles(this);
+		this.hide();
+	}
+
+
 	private void btnAbout_clicked(){
 		var dialog = new AboutWindow();
 		dialog.set_transient_for (this);
@@ -2410,32 +2475,6 @@
 
 	// encoding ----------------------------------
 
-	private void crop_videos(){
-		if (App.InputFiles.size == 0){
-			string title = _("No Files");
-			string msg = _("Add some files to the file list");
-			gtk_messagebox(title, msg, this, true);
-			return;
-		}
-
-		int count = 0 ;
-		foreach(var mf in App.InputFiles){
-			if (mf.HasVideo){
-				count++;
-			}
-		}
-		
-		if (count == 0){
-			string title = _("No Videos");
-			string msg = _("Add some videos to the file list");
-			gtk_messagebox(title, msg, this, true);
-			return;
-		}
-
-		var win = new CropVideoBatchWindow(this);
-		this.hide();
-	}
-
 	private void start(){
 		if (App.InputFiles.size == 0){
 			string title = _("No Files");
@@ -2474,7 +2513,7 @@
 		btnBackground.visible = true;
 btnOpenOutputFolder.visible = dir_exists(App.OutputDirectory);
 
-		btnCrop.visible = false;
+		btnEditFiles.visible = false;
 		btnStart.visible = false;
 		btnAddFiles.visible = true;
 		btnRemoveFiles.visible = false;
@@ -2519,7 +2558,7 @@
 		//colCrop.visible = !App.TileView;
 		colProgress.visible = false;
 
-		btnCrop.visible = true;
+		btnEditFiles.visible = true;
 		btnStart.visible = true;
 		btnAddFiles.visible = true;
 		btnRemoveFiles.visible = true;

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"){
+			write_to_stdin("cycle pause ");
+		}
+		else{
+			write_to_stdin("pause ");
+		}
 	}
 
 	public void Mute(){
-		write_to_stdin("mute 1");
-		IsMuted = true;
+		if (App.PrimaryPlayer == "mplayer"){
+			write_to_stdin("mute 1");
+			IsMuted = true;
+		}
+		else{
+			write_to_stdin("cycle mute 1");
+		}
 	}
 
 	public void UnMute(){
-		write_to_stdin("mute 0");
-		IsMuted = false;
+		if (App.PrimaryPlayer == "mplayer"){
+			write_to_stdin("mute 0");
+			IsMuted = false;
+		}
+		else{
+			write_to_stdin("cycle mute 0");
+		}
 	}
 
 	public void SetVolume(int percent){
 		Volume = percent;
-		write_to_stdin("volume %d 1".printf(Volume));
+		if (App.PrimaryPlayer == "mpv"){
+			write_to_stdin("set volume %d".printf(Volume));
+		}
+		else{
+			write_to_stdin("volume %d 1".printf(Volume));
+		}
 	}
 	
 	public void Stop(){
@@ -322,10 +416,51 @@
 		write_to_stdin("change_rectangle %d %d ".printf(parameter, amount));
 	}
 
+	public void UpdateRectangle_Left(int change){
+		ChangeRectangle(2, change);
+		ChangeRectangle(0, -change);
+		if (IsPaused){
+			FrameStep();
+		}
+	}
+
+	public void UpdateRectangle_Right(int change){
+		//ChangeRectangle(2, change);
+		ChangeRectangle(0, -change);
+		if (IsPaused){
+			FrameStep();
+		}
+	}
+
+	public void UpdateRectangle_Top(int change){
+		ChangeRectangle(3, change);
+		ChangeRectangle(1, -change);
+		if (IsPaused){
+			FrameStep();
+		}
+	}
+
+	public void UpdateRectangle_Bottom(int change){
+		//ChangeRectangle(3, change);
+		ChangeRectangle(1, -change);
+		if (IsPaused){
+			FrameStep();
+		}
+	}
+
+	public void Mpv_Crop(){
+		int w = mFile.SourceWidth - mFile.CropL - mFile.CropR;
+		int h = mFile.SourceHeight - mFile.CropT - mFile.CropB;
+		int x = mFile.CropL;
+		int y = mFile.CropT;
+		
+		write_to_stdin("vf set \"crop=%d:%d:%d:%d\"".printf(w,h,x,y));
+	}
+	
 	public void FrameStep(){
 		write_to_stdin("frame_step ");
 	}
-	
+
 	public void SetRectangle(){
 		ChangeRectangle(0, - mFile.CropL - mFile.CropR); //0=width
 		FrameStep();

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);
+		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;
+		grid.attach(label,0,1,1,1);
+		
+		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;
+		grid.attach(label,2,0,1,1);
+
+		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;
+		grid.attach(label,2,1,1,1);
+
+		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;
+
+		//source -----------------------------------------------
+		
+		label = new Gtk.Label(_("Source:"));
+		label.xalign = (float) 1.0;
+		label.margin_left = 18;
+		grid.attach(label,4,0,1,1);
+
+		//cropped -----------------------------------------------
+		
+		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);
+
+		//detect -----------------------------------------------'
+		
+		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);
+
+		button.clicked.connect(btnDetect_clicked);
+
+		//finish -----------------------------------------------
+		
+		button = new Button.with_label(_("Finish"));
+		button.margin_left = 18;
+ grid.attach(button,6,1,1,1);
+
+ button.clicked.connect(()=>{ this.destroy(); });
+	}
+
+	private void init_ui_file_trim_options(){
+		var grid = new Gtk.Grid();
+		grid.margin = 6;
+		grid.row_spacing = 3;
+		grid.column_spacing = 3;
+		grid.no_show_all = true;
+		vboxMain.add(grid);
+		grid_trim_basic = grid;
+		
+		Gtk.Adjustment adj;
+		Gtk.SpinButton spin;
+		Gtk.Label label;
+		Gtk.Button button;
+		
+		//start -----------------------------------------
+		
+		label = new Gtk.Label(_("Start (sec):"));
+		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);
+		spin.xalign = (float) 1.0;
+		spin.digits = 3;
+		grid.attach(spin,1,0,1,1);
+		
+		spinStartPos = spin;
+	
+		//end ----------------
+		
+		label = new Gtk.Label(_("End (sec):"));
+		label.xalign = (float) 1.0;
+		grid.attach(label,0,1,1,1);
+		
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);
+		spin.xalign = (float) 1.0;
+		spin.digits = 3;
+		grid.attach(spin,1,1,1,1);
+
+		spinEndPos = spin;
+
+		//set start ---------------------------
+		
+		button = new Button.with_label(_("Set"));
+		button.set_tooltip_text(_("Set current playback position as starting position"));
+ grid.attach(button,2,0,1,1);
+
+		button.clicked.connect(()=>{
+			spinStartPos.adjustment.value = player.Position;
+		});
+
+		//set end ----------------------
+		
+		button = new Button.with_label(_("Set"));
+		button.set_tooltip_text(_("Set current playback position as ending position"));
+ grid.attach(button,2,1,1,1);
+
+ button.clicked.connect(()=>{
+			spinEndPos.adjustment.value = player.Position;
+		});
+ 
+		//advanced -------------------------------
+		
+		button = new Button.with_label(_("Advanced Mode"));
+		button.margin_left = 24;
+		button.set_tooltip_text(_("Select multiple segments"));
+ grid.attach(button,3,0,1,1);
+
+		button.clicked.connect(()=>{
+			grid_trim_basic.visible = false;
+
+			grid_trim_advanced.no_show_all = false;
+			grid_trim_advanced.show_all();
+			grid_trim_advanced.visible = true;
+		});
+
+		//finish ---------------------------------------------
+		
+		button = new Button.with_label(_("Finish"));
+		button.margin_left = 24;
+ grid.attach(button,3,1,1,1);
+
+ button.clicked.connect(()=>{ this.destroy(); });
+	}
+
+	private void init_ui_file_trim_options_advanced(){
+		var grid = new Gtk.Grid();
+		grid.margin = 6;
+		grid.row_spacing = 3;
+		grid.column_spacing = 3;
+		grid.column_homogeneous = true;
+		grid.no_show_all = true;
+		vboxMain.add(grid);
+		grid_trim_advanced = grid;
+		
+		//Gtk.Adjustment adj;
+		//Gtk.SpinButton spin;
+		Gtk.Label label;
+		Gtk.Button button;
+
+		//select the segments to be included in output file
+		label = new Gtk.Label(_("Select the segments to include in output file:"));
+		label.xalign = (float) 0.0;
+		grid.attach(label,0,0,5,1);
+
+		//timeline -----------------------------------
+		
+		timeline = new Gtk.DrawingArea();
+		timeline.set_size_request(-1, 30);
+		timeline.hexpand = true;
+		
+		timeline.draw.connect(timeline_draw);
+		
+		timeline.add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+		timeline.button_press_event.connect(timeline_button_press);
+
+		timeline.add_events(Gdk.EventMask.POINTER_MOTION_MASK);
+		timeline.motion_notify_event.connect(timeline_motion_notify_event);
+
+		var scroll = new Gtk.ScrolledWindow(null, null);
+		scroll.set_shadow_type (ShadowType.ETCHED_IN);
+		scroll.hscrollbar_policy = PolicyType.NEVER;
+		scroll.vscrollbar_policy = PolicyType.NEVER;
+		scroll.expand = true;
+		scroll.margin_bottom = 6;
+		scroll.add (timeline);
+		grid.attach(scroll,0,1,5,1);
+
+		//start segment -------------------------------------
+		
+		button = new Button.with_label(_("Start Segment"));
+ grid.attach(button,0,2,1,1);
+		
+ button.clicked.connect(()=>{
+			mClipNew = new MediaClip();
+			if (mClipNew != null){
+				mClipNew.StartPos = player.Position;
+				timeline_redraw();
+			}
+		});
+		
+		//end segment -------------------------------------
+		
+		button = new Button.with_label(_("End Segment"));
+ grid.attach(button,1,2,1,1);
+
+		button.clicked.connect(()=>{
+			if (mClipNew != null){
+				mClipNew.EndPos = player.Position;
+				if (!mFile.clip_list.contains(mClipNew)){
+					mFile.clip_list.add(mClipNew);
+				}
+				timeline_redraw();
+				//log_msg("added:%.1f,%.1f".printf(mClip.StartPos,mClip.EndPos));
+			}
+		});
+
+		//delete segment -------------------------------------
+			
+ button = new Button.with_label(_("Delete Segment"));
+ grid.attach(button,2,2,1,1);
+
+		button.clicked.connect(()=>{
+			if (mClipSelected != null){
+				for(int i = 0; i < mFile.clip_list.size; i++){
+					var clip = mFile.clip_list[i];
+					if ((clip.StartPos == mClipSelected.StartPos) && (clip.EndPos == mClipSelected.EndPos)){
+						mFile.clip_list.remove(clip);
+						break;
+					}
+				}
+				timeline_redraw();
+			}
+		});
+
+		//basic mode ---------------------------------------
+		
+		button = new Button.with_label(_("Basic Mode"));
+ grid.attach(button,3,2,1,1);
+ 
+ button.clicked.connect(()=>{
+			grid_trim_basic.no_show_all = false;
+			grid_trim_basic.show_all();
+			grid_trim_basic.visible = true;
+			
+			grid_trim_advanced.visible = false;
+		});
+
+		//finish ---------------------------------------------
+		
+		button = new Button.with_label(_("Finish"));
+ grid.attach(button,4,2,1,1);
+
+ button.clicked.connect(()=>{ this.destroy(); });
+	}
+
+	private bool timeline_draw(Cairo.Context context){
+		weak Gtk.StyleContext style_context = timeline.get_style_context ();
+		var color_default = style_context.get_color (0);
+
+		var color_blue_100 = Gdk.RGBA();
+		color_blue_100.parse("#BBDEFB");
+		color_blue_100.alpha = 1.0;
+
+		var color_blue_200 = Gdk.RGBA();
+		color_blue_200.parse("#90CAF9");
+		color_blue_200.alpha = 1.0;
+
+		var color_blue_300 = Gdk.RGBA();
+		color_blue_300.parse("#64B5F6");
+		color_blue_300.alpha = 1.0;
+
+		var color_white = Gdk.RGBA();
+		color_white.parse("white");
+		color_white.alpha = 1.0;
+
+		var color_black = Gdk.RGBA();
+		color_black.parse("black");
+		color_black.alpha = 1.0;
+
+		var color_grey_700 = Gdk.RGBA();
+		color_grey_700.parse("#616161");
+		color_grey_700.alpha = 1.0;
+
+		var color_grey_800 = Gdk.RGBA();
+		color_grey_800.parse("#424242");
+		color_grey_800.alpha = 1.0;
+
+		var color_red = Gdk.RGBA();
+		color_red.parse("red");
+		color_red.alpha = 1.0;
+
+		var color_blue = Gdk.RGBA();
+		color_blue.parse("blue");
+		color_blue.alpha = 1.0;
+
+		color_default = color_black;
+
+		int canvas_w = timeline.get_allocated_width();
+		int canvas_h = timeline.get_allocated_height();
+
+		int w = 0;
+		int h = 0;
+		int x = 0;
+		int y = 0;
+
+		//------ BEGIN CONTEXT -------------------------------------------------
+		//Draw white background
+		
+		context.set_line_width (1);
+		Gdk.cairo_set_source_rgba (context, color_white);
+		context.rectangle(0, 0, canvas_w, canvas_h);
+
+		context.fill();
+		//------ END CONTEXT ---------------------------------------------------
+
+		//------ BEGIN CONTEXT -------------------------------------------------
+		//Draw border
+		
+		context.set_line_width (1);
+		Gdk.cairo_set_source_rgba (context, color_black);
+		
+		context.move_to(0,0);
+		context.line_to(canvas_w,0);
+		context.line_to(canvas_w,canvas_h);
+		context.line_to(0,canvas_h);
+		context.line_to(0,0);
+		
+		context.stroke();
+		//------ END CONTEXT ---------------------------------------------------
+		
+		//------ BEGIN CONTEXT -------------------------------------------------
+		//Draw segments
+		
+		context.set_line_width (1);
+		Gdk.cairo_set_source_rgba (context, color_grey_700);
+		
+		foreach(MediaClip clip in mFile.clip_list){
+			if (clip == mClipSelected){
+				Gdk.cairo_set_source_rgba (context, color_grey_800);
+			}
+			else{
+				Gdk.cairo_set_source_rgba (context, color_grey_700);
+			}
+			
+			x = (int)((clip.StartPos / (mFile.Duration/1000.0)) * canvas_w);
+			y = 0;
+			w = (int)((clip.Duration() / (mFile.Duration/1000.0)) * canvas_w);
+			h = canvas_h;
+			
+			context.rectangle(x, y, w, h);
+			context.fill();
+
+			//log_msg("clip: %.1f x %d = %d".printf((clip.StartPos / (mFile.Duration/1000.0)),canvas_w,x));
+		}
+		
+		//------ END CONTEXT ---------------------------------------------------
+
+		//------ BEGIN CONTEXT -------------------------------------------------
+		//Draw start point of new segment
+		
+		context.set_line_width (1);
+		Gdk.cairo_set_source_rgba (context, color_black);
+
+		if ((mClipNew != null) && (mClipNew.EndPos < 0.1)){
+			x = (int)((mClipNew.StartPos / (mFile.Duration/1000.0)) * canvas_w);
+
+			context.move_to(x, 0);
+			context.line_to(x, canvas_h);
+		
+			context.stroke();
+		}
+		//------ END CONTEXT ---------------------------------------------------
+
+		//------ BEGIN CONTEXT -------------------------------------------------
+		//Draw play position
+		
+		context.set_line_width (1);
+		Gdk.cairo_set_source_rgba (context, color_red);
+
+		if ((player.Position > 0) && (player.Position < (mFile.Duration/1000.0))){
+			x = (int)((player.Position / (mFile.Duration/1000.0)) * canvas_w);
+
+			context.move_to(x, 0);
+			context.line_to(x, canvas_h);
+		
+			context.stroke();
+		}
+		
+		//------ END CONTEXT ---------------------------------------------------
+		
+		return true;
+	}
+
+	private void timeline_redraw(){
+		timeline.queue_draw_area(0, 0,timeline.get_allocated_width(),timeline.get_allocated_height());
+	}
+
+	private bool timeline_motion_notify_event(Gdk.EventMotion event){
+		//get position
+		int w = timeline.get_allocated_width();
+		double pos = ((event.x * 1.0) / w) * (mFile.Duration/1000.0);
+
+		//get clip
+		int index = 0;
+		MediaClip current_clip = null;
+		foreach(MediaClip clip in mFile.clip_list){
+			index++;
+			if ((clip.StartPos < pos) && (clip.EndPos > pos)){
+				current_clip = clip;
+				break;
+			}
+		}
+
+		string msg = "";
+		string time = "";
+			
+		if (current_clip != null){
+			msg += "Clip #%d\n\n".printf(index);
+			time = format_duration((long) (current_clip.StartPos * 1000.0), true);
+			msg += "Start Pos:\t%s = %.3f sec\n".printf(time,current_clip.StartPos);
+			time = format_duration((long) (current_clip.EndPos * 1000.0), true);
+			msg += "End Pos:\t%s = %.3f sec\n".printf(time,current_clip.EndPos);
+			time = format_duration((long) (current_clip.Duration() * 1000.0), true);
+			msg += "Duration:\t%s = %.3f sec".printf(time,current_clip.Duration());
+			timeline.set_tooltip_markup(msg);
+		}
+		else{
+			//time = format_duration((long) (pos * 1000.0));
+			//msg += "Position: %s (%0.03f)".printf(time, pos);
+			//timeline.set_tooltip_markup(msg);
+		}
+
+		return true;
+	}
+
+	private bool timeline_button_press(Gdk.EventButton event){
+		//get position
+		int w = timeline.get_allocated_width();
+		double pos = ((event.x * 1.0) / w) * (mFile.Duration/1000.0);
+
+		//get clip
+		int index = 0;
+		MediaClip current_clip = null;
+		foreach(MediaClip clip in mFile.clip_list){
+			index++;
+			if ((clip.StartPos < pos) && (clip.EndPos > pos)){
+				current_clip = clip;
+				break;
+			}
+		}
+		mClipSelected = current_clip;
+
+		//seek
+		player.Seek(pos);
+		
+		timeline_redraw();
+		
+		return true;
+	}
+	//crop
+
+	private void spinCrop_value_changed_connect(){
+		spinCropL.value_changed.connect(spinCropL_value_changed);
+		spinCropR.value_changed.connect(spinCropR_value_changed);
+		spinCropT.value_changed.connect(spinCropT_value_changed);
+		spinCropB.value_changed.connect(spinCropB_value_changed);
+	}
+	
+	private void spinCrop_value_changed_disconnect(){
+		spinCropL.value_changed.disconnect(spinCropL_value_changed);
+		spinCropR.value_changed.disconnect(spinCropR_value_changed);
+		spinCropT.value_changed.disconnect(spinCropT_value_changed);
+		spinCropB.value_changed.disconnect(spinCropB_value_changed);
+	}
+	
+	private void spinCropL_value_changed(){
+		int original = mFile.CropL;
+		int modified = (int) spinCropL.get_value();
+		int change = modified - original;
+		mFile.CropL = modified;
+
+		if (App.PrimaryPlayer == "mplayer"){
+			player.UpdateRectangle_Left(change);
+		}
+		else{
+			player.Mpv_Crop();
+			CropCanvas(true);
+		}
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropR_value_changed(){
+		int original = mFile.CropR;
+		int modified = (int) spinCropR.get_value();
+		int change = modified - original;
+		mFile.CropR = modified;
+
+		if (App.PrimaryPlayer == "mplayer"){
+			player.UpdateRectangle_Right(change);
+		}
+		else{
+			player.Mpv_Crop();
+			CropCanvas(true);
+		}
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropT_value_changed(){
+		int original = mFile.CropT;
+		int modified = (int) spinCropT.get_value();
+		int change = modified - original;
+		mFile.CropT = modified;
+
+		if (App.PrimaryPlayer == "mplayer"){
+			player.UpdateRectangle_Top(change);
+		}
+		else{
+			player.Mpv_Crop();
+			CropCanvas(true);
+		}
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropB_value_changed(){
+		int original = mFile.CropB;
+		int modified = (int) spinCropB.get_value();
+		int change = modified - original;
+		mFile.CropB = modified;
+
+		if (App.PrimaryPlayer == "mplayer"){
+			player.UpdateRectangle_Bottom(change);
+		}
+		else{
+			player.Mpv_Crop();
+			CropCanvas(true);
+		}
+		
+		update_label_for_cropped_size();
+	}
+
+	private void btnDetect_clicked(){
+
+		var status_msg = _("Detecting borders...");
+		var dlg = new SimpleProgressWindow.with_parent(this, status_msg);
+		dlg.set_title(_("Please Wait..."));
+		dlg.show_all();
+		gtk_do_events();
+	
+		if (App.PrimaryPlayer == "mplayer"){
+
+			//get total count
+			App.progress_total = 10;
+			App.progress_count = 0;
+
+			//init values
+			mFile.CropL = 9999;
+			mFile.CropR = 9999;
+			mFile.CropT = 9999;
+			mFile.CropB = 9999;
+		
+			//restart mplayer with crop detect filter
+			player.Exit();
+			player.StartPlayerWithCropDetect();
+			player.Open(mFile, false, true, true);
+
+			//seek
+			double duration = (mFile.Duration / 1000.0);
+			double step = duration / 10.0;
+			for(int i = 0; i < 10; i++){
+				player.Seek(step * i);
+				sleep(100);
+				App.progress_count++;
+				dlg.update_progressbar();
+			}
+
+			//restart mplayer with crop filter
+			player.Exit();
+			player.StartPlayerWithCropFilter();
+			load_file();
+		}
+		else{
+		
+			try {
+				crop_detect_is_running = true;
+				Thread.create<void> (ffmpeg_crop_detect_thread, true);
+			} catch (ThreadError e) {
+				crop_detect_is_running = false;
+				log_error (e.message);
+			}
+
+			dlg.pulse_start();
+			while (crop_detect_is_running) {
+				dlg.update_message(status_msg);
+				dlg.sleep(200);
+			}
+		}
+
+		if ((mFile.CropL == 9999)||(mFile.CropL < 0)){
+			mFile.CropL = 0;
+		}
+		if ((mFile.CropR == 9999)||(mFile.CropR < 0)){
+			mFile.CropR = 0;
+		}
+		if ((mFile.CropT == 9999)||(mFile.CropT < 0)){
+			mFile.CropT = 0;
+		}
+		if ((mFile.CropB == 9999)||(mFile.CropB < 0)){
+			mFile.CropB = 0;
+		}
+			
+		dlg.finish(_("Detected Parameters: %d, %d, %d, %d").printf(mFile.CropL,mFile.CropR,mFile.CropT,mFile.CropB));
+
+		update_spinbutton_values();
+
+		if (App.PrimaryPlayer == "mpv"){
+			player.Mpv_Crop();
+			CropCanvas(true);
+		}
 	}
 
-	public static void PlayFile(MediaFile mf){
-		var win = new MediaPlayerWindow(mf);
-		win.show_all();
-		win.Play();
+	private void ffmpeg_crop_detect_thread() {
+		mFile.crop_detect();
+		crop_detect_is_running = false;
+	}
+	
+	private void update_label_for_cropped_size(){
+		lblCroppedSize.label = "%dx%d".printf((mFile.SourceWidth - mFile.CropL - mFile.CropR),(mFile.SourceHeight - mFile.CropT - mFile.CropB));
 	}
 
-	public void init_ui_player(){
+	//trim
+	
+	private void spinTrim_value_changed_connect(){
+		spinStartPos.value_changed.connect(spinStartPos_value_changed);
+		spinEndPos.value_changed.connect(spinEndPos_value_changed);
+	}
+	
+	private void spinTrim_value_changed_disconnect(){
+		spinStartPos.value_changed.disconnect(spinStartPos_value_changed);
+		spinEndPos.value_changed.disconnect(spinEndPos_value_changed);
+	}
+	
+	private void spinStartPos_value_changed(){
+		mFile.StartPos = spinStartPos.adjustment.value;
+	}
+
+	private void spinEndPos_value_changed(){
+		mFile.EndPos = spinEndPos.adjustment.value;
+	}
+
+	//load file
+	
+	private void load_file(){
+		canvas.set_size_request(mFile.SourceWidth, mFile.SourceHeight);
+		
+		if (action == "crop"){
+			load_file_for_crop();
+		}
+		else if (action == "trim"){
+			load_file_for_trim();
+		}
+		else if (action == "play"){
+			load_file_for_play();
+		}
+
+		btnMute.visible = mFile.HasAudio;
+		btnFullscreen.visible = mFile.HasVideo;
+		cmbZoom.visible = mFile.HasVideo;
+		
+		scalePos.adjustment.upper = (mFile.Duration/1000.0);
+		
+		status_timer_start();
+	}
+	
+	private void load_file_for_crop(){
+		cmbZoom_changed();
+		
+		player.Open(mFile, true, false, true);
+		
+		update_spinbutton_values();
+
+		if (!player.IsPaused){
+			player.PauseToggle();
+		}
+	}
+
+	private void update_spinbutton_values(){
+ spinCrop_value_changed_disconnect();
+ 
+		spinCropL.adjustment.value = mFile.CropL;
+		spinCropR.adjustment.value = mFile.CropR;
+		spinCropT.adjustment.value = mFile.CropT;
+		spinCropB.adjustment.value = mFile.CropB;
+		
+		lblSourceSize.label = "%dx%d".printf(mFile.SourceWidth,mFile.SourceHeight);
+		update_label_for_cropped_size();
+		
+		spinCrop_value_changed_connect();
+	}
+
+	private void load_file_for_trim(){
+		cmbZoom_changed();
+
+		spinTrim_value_changed_disconnect();
+		
+		spinStartPos.adjustment.value = mFile.StartPos;
+		spinEndPos.adjustment.value = mFile.EndPos;
+
+		spinTrim_value_changed_connect();
+		
+		player.Open(mFile, false, false, true);
+	}
+
+	private void load_file_for_play(){
+		cmbZoom_changed();
+
+		player.Open(mFile, false, false, true);
+	}
+
+	//player
+	
+	private void init_ui_player(){
 		canvas = new Gtk.DrawingArea();
+		canvas.set_size_request(400,300);
 		canvas.expand = true;
-		vboxMain.pack_start (canvas, true, true, 0);
+		canvas.halign = Align.CENTER;
+		vboxMain.pack_start (canvas, false, false, 0);
 
-		canvas.realize.connect(() => {
+ this.canvas.realize.connect(() => {
 			player.WindowID = get_widget_xid(canvas);
-			player.StartPlayer();
+			if (action == "crop"){
+				player.StartPlayerWithCropFilter();
+			}
+			else if (action == "trim"){
+				player.StartPlayer();
+			}
+			else if (action == "play"){
+				player.StartPlayer();
+			}
 		});
 	}
-
-	public void init_ui_player_controls(){
+	
+	private void init_ui_player_controls(){
 		var hboxControls = new Gtk.Box(Orientation.HORIZONTAL, 6);
 		hboxControls.margin = 6;
 		vboxMain.add(hboxControls);
 
 		//btnPlay
 		btnPlay = new Gtk.Button();
+		btnPlay.always_show_image = true;
 		hboxControls.add(btnPlay);
 
 		btnPlay.clicked.connect(() => {
@@ -112,6 +994,7 @@
 
 		//btnMute
 		btnMute = new Gtk.Button();
+		btnMute.always_show_image = true;
 		hboxControls.add(btnMute);
 
 		btnMute.clicked.connect(() => {
@@ -124,10 +1007,31 @@
 			set_mute_icon();
 		});
 
+		//btnFullscreen
+		btnFullscreen = new Gtk.Button();
+		btnFullscreen.always_show_image = true;
+		hboxControls.add(btnFullscreen);
+
+		btnFullscreen.clicked.connect(() => {
+			IsMaximized = !IsMaximized;
+			if (IsMaximized){
+				this.fullscreen();
+				vboxMain.set_child_packing(canvas, true, true, 0, Gtk.PackType.START);
+				canvas.halign = Align.FILL;
+				canvas.valign = Align.FILL;
+			}
+			else{
+				this.unfullscreen();
+				cmbZoom_changed();
+			}
+			set_fullscreen_icon();
+		});
+
+
 		//scalePos
 		scalePos = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1000, 1);
 		scalePos.adjustment.value = 0;
-		scalePos.has_origin = true;
+		//scalePos.has_origin = true;
 		scalePos.value_pos = PositionType.BOTTOM;
 		scalePos.hexpand = true;
 		scalePos.set_size_request(300,-1);
@@ -136,7 +1040,7 @@
 		scalePos_value_changed_connect();
 		
 		scalePos.format_value.connect((val)=>{
-			return format_duration((long) (val * 1000)) + " / " + format_duration(mFile.Duration);
+			return format_duration((long) (val * 1000.0), true) + " / " + format_duration(mFile.Duration, true);
 		});
 
 		//scaleVolume
@@ -151,6 +1055,68 @@
 		scaleVolume.value_changed.connect(()=>{
 			player.SetVolume((int)scaleVolume.adjustment.value);
 		});
+
+		//cmbZoom
+		cmbZoom = new ComboBox();
+		var textCell = new CellRendererText();
+ cmbZoom.pack_start(textCell, false);
+ cmbZoom.set_attributes(textCell, "text", 0);
+ hboxControls.add(cmbZoom);
+
+ //populate
+ TreeIter iter;
+		var model = new Gtk.ListStore (2, typeof (string), typeof (string));
+		model.append (out iter);
+		model.set (iter,0,_("25%"),1,"0.25");
+		model.append (out iter);
+		model.set (iter,0,_("50%"),1,"0.50");
+		model.append (out iter);
+		model.set (iter,0,_("75%"),1,"0.75");
+		model.append (out iter);
+		model.set (iter,0,_("100%"),1,"1.0");
+		model.append (out iter);
+		model.set (iter,0,_("200%"),1,"2.0");
+		cmbZoom.set_model(model);
+
+		if (mFile.SourceWidth > (Gdk.Screen.get_default().get_width() / 2)){
+			cmbZoom.active = 2;
+		}
+		else{
+			cmbZoom.active = 3;
+		}
+		
+		cmbZoom.changed.connect(cmbZoom_changed);
+
+		set_play_icon();
+		set_mute_icon();
+		set_fullscreen_icon();
+	}
+
+	private void cmbZoom_changed(){
+		if (App.PrimaryPlayer == "mpv"){
+			CropCanvas(true);
+		}
+		else{
+			CropCanvas(false);
+		}
+	}
+
+	private void CropCanvas(bool cropCanvas){
+		double zoom = double.parse(gtk_combobox_get_value(cmbZoom,1,"1.0"));
+		int zoomWidth, zoomHeight;
+		
+		if (cropCanvas){
+			zoomWidth = (int) ((mFile.SourceWidth - mFile.CropL - mFile.CropR) * zoom * 1.0);
+			zoomHeight = (int) ((mFile.SourceHeight - mFile.CropT - mFile.CropB) * zoom * 1.0);
+		}
+		else{
+			zoomWidth = (int) (mFile.SourceWidth * zoom * 1.0);
+			zoomHeight = (int) (mFile.SourceHeight * zoom * 1.0);
+		}
+
+		canvas.set_size_request(zoomWidth, zoomHeight);
+		this.resize(100,50);//set a visible min size
+		gtk_do_events();
 	}
 
 	private void scalePos_value_changed(){
@@ -179,7 +1145,7 @@
 	
 	private void set_mute_icon(){
 		if (player.IsMuted){
-			btnMute.set_tooltip_text (_("Unmute"));
+			btnMute.set_tooltip_text (_("Mute"));
 			btnMute.image = get_shared_icon("", "audio-muted.svg", 24);
 		}
 		else{
@@ -189,13 +1155,16 @@
 		gtk_do_events();
 	}
 
-	protected void Play(){
-		canvas.set_size_request(mFile.SourceWidth, mFile.SourceHeight);
-		scalePos.adjustment.upper = (mFile.Duration/1000);
-		player.Open(mFile, false, false, true);
-		title = mFile.Name + " - Selene";
-		
-		status_timer_start();
+	private void set_fullscreen_icon(){
+		if (IsMaximized){
+			btnFullscreen.set_tooltip_text (_("Fullscreen"));
+			btnFullscreen.image = get_shared_icon("", "view-restore.png", 24);
+		}
+		else{
+			btnFullscreen.set_tooltip_text (_("Fullscreen"));
+			btnFullscreen.image = get_shared_icon("", "view-fullscreen.png", 24);
+		}
+		gtk_do_events();
 	}
 
 	private void status_timer_start(){
@@ -215,15 +1184,21 @@
 		status_timer_stop();
 
 		scalePos_value_changed_disconnect();
-		scalePos.adjustment.value = (int) player.Position;
+		scalePos.adjustment.value = (double) player.Position;
 		scalePos_value_changed_connect();
 
 		set_play_icon();
 		set_mute_icon();
 
+		if ((grid_trim_advanced != null) && grid_trim_advanced.visible){
+			timeline_redraw();
+		}
+		
 		gtk_do_events();
 
 		status_timer_start();
 		return true;
 	}
+
 }
+

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