13
0
Commit Graph

22 Commits

Author SHA1 Message Date
7022456b4f tweak A/V import logic 2014-03-19 18:22:24 +01:00
7d66ae5b51 clarify A/V import options 2014-03-19 18:22:24 +01:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
6daa7c1bc3 remove unnecessary header include 2013-10-04 12:46:02 -04:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
c4227ca706 fix typos 2013-08-09 19:35:27 +02:00
43ae996b3a dedicated namespace for video-utils
conflicting symbol prophylaxis
2013-08-03 16:54:57 +02:00
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
dd65329363 clean up video related messages 2013-07-23 20:24:23 +02:00
650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
003492cbf9 move ff* structs & typedef into dedicated namespace
(further avoid conflicts with plugins)
2013-07-16 18:01:56 +02:00
15be154515 use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files 2013-07-15 14:29:00 -04:00
ce0aa96838 NOOP - use PBD's std::string to number functions 2013-06-08 09:03:26 +02:00
3973ce81b3 remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works 2013-05-02 18:13:35 -04:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
deaceb4727 vtl: minor UI dialog tweaks 2013-03-30 16:51:02 +01:00
daec8e44d5 vtl: rework import workflow
- do not allow to simply copy the video file
 - decision to transcode or just reference is made in "transcode dialog"
   not during file-selection.
   Only there the actual codec is known and can be judged to be suitable
   for direct reference
 - simplify "transcode dialog" - no more buttons for specific actions,
   drop-down select actions.
 - increase minimum bitrate for imported file to 500kbit/s
2013-03-29 12:36:14 +01:00
74c9bc6fcc vtl: hide audio-import button when import/processing started 2013-03-28 21:53:42 +01:00
a1429ed39f vtl: simple/localhost mode.
Hide most of the setup complexity that is irrelevant when
running the video-server on the same host as Ardour.

Add an abstraction layer to the config which will become
important later when /building in/ the video-server.
2013-03-28 13:42:51 +01:00
ba7def458e messages related to video-server & ffmpeg external binaries 2013-03-27 16:04:56 +01:00
de194b48e5 vtl: fix crash if ffprobe returns zero fps 2013-03-14 01:38:21 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00