13
0
Commit Graph

20 Commits

Author SHA1 Message Date
8c9749e42f merge with master and fix 4 conflicts by hand 2014-06-02 11:32:13 -04:00
b768d6c39d Include windows.h for Registry access related API 2014-05-14 09:47:40 +10:00
9f266e9061 try get_win_special_folder() for harvid & xjadeo (if registry fails) 2014-04-24 13:22:17 +02:00
1929cbffb4 query windows registry for xjadeo & harvid path 2014-04-24 02:08:19 +02:00
670c066793 add manual reference to missing video-tools warnings 2014-04-11 17:24:50 +02:00
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
001fc1f55b fix spelling and program name abstraction 2013-10-15 14:03:41 -04:00
8ddd12a60d Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04: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
c0e65452b1 undef SearchPath where needed as it is defined via windows.h 2013-07-22 13:44:32 +10:00
533e40ca52 Work around badly chosen argument name in giomm/dbusmessage.h
interface is defined in windows/mingw headers. hopefully this will
be fixed in giomm at some point and this crap can be removed
2013-07-22 13:44:32 +10: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
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
1bec1059fb canonical names for video-tools 2013-03-26 22:19:04 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00