Paul Davis
0aac62e013
Merge branch 'master' into windows
2013-07-14 08:27:22 -04:00
Paul Davis
5cafb98983
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-11 15:29:28 -04:00
Paul Davis
167e8bbc2f
Include pbd/localtime_r.h for mingw build
2013-07-11 15:23:12 -04:00
Paul Davis
029c530203
Disable checking for memory locking support on windows
...
not sure if this is needed on windows, can implement later in PBD
2013-07-11 15:18:31 -04:00
Robin Gareus
bd9e2737b7
NOOP - prevent headaches and remove cruft
...
Every "point zero one" seconds is only 25 Hz in ardour..
2013-07-11 20:39:23 +02:00
Paul Davis
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
Robin Gareus
04ad452bca
fix meterbridge window behaviour on session unload/close.
2013-07-10 15:27:03 +02:00
Paul Davis
38f2aa51bd
Merge branch 'master' into cairocanvas
2013-07-09 09:11:52 -04:00
Robin Gareus
2b0fef5933
revert 3c6ff2f0 now that WM-proxy is session-aware..
...
also includes a few additional tweaks on top of the revert:
don't set sessions to windows managed by the WM::Manager,
and also call WM::Manager's set_session (s); when closing session.
2013-07-07 19:29:55 +02:00
Robin Gareus
3c6ff2f02f
fix/workaround window-proxy session-management
...
The window proxy defers construction of classes.
set_session() is called before the instances are available.
the proxy-manager only calls set_session() for SessionHandlePtr
but not the class-specific method..
fixes http://tracker.ardour.org/view.php?id=5566
2013-07-07 04:18:23 +02:00
Robin Gareus
539e58bf5d
possible fix for crash on exit - err on the side of caution
2013-07-07 04:17:04 +02:00
Paul Davis
3031a99364
Merge branch 'master' into cairocanvas
2013-06-25 22:24:47 -04:00
Paul Davis
11becd4a6b
properly restore newer (cairo-canvas related) UI config parameters
2013-06-21 17:15:56 -04:00
Robin Gareus
b407b753f7
vtl: remember original video-file for later export/mux
2013-06-17 09:46:01 +02:00
Robin Gareus
489121ca20
vtl: clean-up "Remove Video" action state
2013-06-13 17:17:28 +02:00
Robin Gareus
27e2b09f63
vtl: check if server's docroot matches ardour's config
...
NOTE: this breaks backwards compatibility with icsd and
harvid < 0.3.0 which do not report their settings.
It may also conflict with harvid running on localhost in a chroot.
Ideally this will be a warning only.
That the user can choose to ignore this and should get the option
to stop the video-server and re-start it using a different docroot.
2013-06-13 00:58:19 +02:00
Robin Gareus
6b480bb2f7
vtl: make "Remove Video" insensitive if N/A
2013-06-13 00:58:19 +02:00
Robin Gareus
3942eec0e9
improve video-server start-up sequence
...
* don't wait if launching the app failed
* lower timeout and check interval
* print warnings..
2013-06-09 15:51:31 +02:00
Robin Gareus
b8b24e8313
give video-server some time so launch -- prevent multiple instance
2013-06-07 20:14:42 +02:00
Paul Davis
cd8180c864
Merge branch 'master' of https://github.com/johnwpoliver/ardour
2013-06-05 13:19:23 -04:00
Robin Gareus
3b43b08ee8
Remove unused boost/locale include.
...
boost/locale is only avail with libboost >= 1.48,
ardour's wscript checks for >= 1.39
2013-05-22 17:21:44 +02:00
johnwpoliver
a65ab1d76c
Candidate fix for 0005480: Text in warning window for memory limit not displayed in full. Conf file path was not being passed to string_compose constructor
2013-05-12 23:40:15 +01:00
Paul Davis
4cd27e4733
cleanup menus/actions mess exposed on OS X; remove video items from OS X menus (for now)
2013-05-08 11:43:33 -04:00
Paul Davis
bedc7b170e
change namespace/naming of WindowManager classes; register all ArdourDialog and ArdourWindow classes as ProxyTemporary windows so that transient-for can be set for all such windows
2013-05-07 22:09:16 -04:00
Paul Davis
87d502c15b
work work on window mgmt: offer the change to mark all floating windows as Dialogs (in th theme manager), and mark ArdourWindow and ArdourDialog as transient-for on creation, based on current WindowManager (ardour-object) settings
2013-05-07 18:09:12 -04:00
Paul Davis
a902737db9
various changes to window visibility mgmt, including use of the mixbus2 code for toggling editor + mixer windows. no longer attempt to track changes made outside of ardour, which is a lost cause
2013-05-07 13:01:26 -04:00
Paul Davis
40944574c6
the big rework of window management. probably not complete at thsi point, but this is mostly functional
2013-05-04 22:02:05 -04:00
Paul Davis
6fd66bd467
move CloseAllDialogs signal and associated method from ArdourDialog to ARDOUR_UI, and make ArdourWindow obey it too
2013-05-02 21:13:36 -04:00
Paul Davis
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
Paul Davis
a9341bd5f0
improve relationship between ArdourDialog and Splash on OS X, where window restacking doesn't really work the way we need it to. more complex than anticipated because it seems that destroying a Gtk::Dialog does not emit its hide() or unmap() or unmap_event() signals
2013-04-30 13:50:45 -04:00
Robin Gareus
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
Robin Gareus
ed1f310f10
vtl: rework session-needs-save logic
...
* videotimeline now immediately marks the session dirty on
every state-changing operation
* video-montor is polled every 2.5 seconds for menu-relevant state info
(ontop, OSD,..) and every 30 seconds for full state (window pos, size,..)
* new interface to query the video-monitor for its state and wait for
all replies - terminating the process and using ::wait() is no longer
required
* Ardour> quit and Ardour > close-session does no longer close the video
session to enforce video-monitor state sync but uses above new interface
2013-04-09 04:05:46 +02:00
Robin Gareus
8a3ebe7510
vtl: resume if "don't close/exit" is selected
2013-04-09 04:05:34 +02:00
Roy Vegard Ovesen
11747ab16c
Enable snapshots and port connect on startup
2013-04-03 17:50:59 +02:00
Paul Davis
ec6dd2dc8b
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-03 10:35:47 -04:00
Roy Vegard Ovesen
810a603fb2
Prevent infinite loops
2013-04-03 16:18:42 +02:00
Robin Gareus
b27700f10c
fix NSM initialization.
...
Possible segfault on startup if NSM is not used.
2013-04-03 02:36:15 +02:00
Roy Vegard Ovesen
992fe3adeb
Don't wait for session_is_loaded from nsm server
2013-04-02 20:33:39 +02:00
Robin Gareus
e06ff1cf29
vtl: update session start/end only when adding (or dragging) the video
2013-04-02 18:06:47 +02:00
Robin Gareus
467b137222
vtl: remove video-maintenance menu
...
* only really relevant for testing/debugging.
* the back-end functions are still used for 'normal' operation
and called implicitly when opening/closing a video.
* call stop_video_server() when removing a video.
2013-04-02 18:06:43 +02:00
Paul Davis
2da10afb64
fix #5424 : routes created from templates do not get names based on the user-supplied text from the add route dialog
2013-04-01 20:45:57 -04:00
Paul Davis
19d5cafa8a
fix up iterator syntax and unnecessary use of X_() in NSM patch
2013-04-01 19:46:24 -04:00
Roy Vegard Ovesen
91080c31db
Disable some actions that are not allowed while under nsm
2013-03-31 15:28:29 +02:00
Roy Vegard Ovesen
2806828962
Better start up
...
Don't reply to nsm server until ardour project is finished loading
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
81a343ff7f
Make sure every imported file is copied to the session path
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
43b94f7aa7
Prevent the new session dialog from appearing
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
6ef371745a
non-session-manager support
...
Implements open, save and dirtiness.
No error checking, no menu items disabling.
2013-03-31 03:59:09 +02:00
Robin Gareus
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
Robin Gareus
941898843e
vtl: add close/remove video menu entry
2013-03-29 12:35:57 +01:00
Robin Gareus
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