bca507a808
Merge branch 'master' into cairocanvas
2013-04-09 14:23:41 -04:00
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
8a3ebe7510
vtl: resume if "don't close/exit" is selected
2013-04-09 04:05:34 +02:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
Roy Vegard Ovesen
11747ab16c
Enable snapshots and port connect on startup
2013-04-03 17:50:59 +02:00
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
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
e06ff1cf29
vtl: update session start/end only when adding (or dragging) the video
2013-04-02 18:06:47 +02:00
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
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
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
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
941898843e
vtl: add close/remove video menu entry
2013-03-29 12:35:57 +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
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
5596f1837d
test master push email
2013-03-12 17:19:39 -04:00
e701adea41
add code to display announcements, and parameterize several URL's used in the program
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 13:44:22 +00:00
ba73a77c63
switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 16:41:45 +00:00
a0282a54d6
fix erroneous use of "Ardour" in text message, and manually update ru.po and add new de.po version
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-05 12:41:15 +00:00
d40c2f9d7c
use markup in that new dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14139 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 22:16:48 +00:00
91ff55bd89
make notice about mismatched session/ardour versions more prominent, since you can guarantee that people are going to do this after release
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14138 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 21:57:29 +00:00
f56913e424
SuperCaliFragilisticHoraAdaequationis
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-03 13:45:32 +00:00
f08f3acbac
remove EnableTranslations action, since this stuff is all done in the prefs dialog now and there is no need for a separate action to use with a menu item
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13979 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 18:42:01 +00:00
2fee2bc60c
fix #5290 for 'Session|Recent' dialog as well as startup dialog.
...
reinstate tooltips for collapsed rows in recent sessions too.
git-svn-id: svn://localhost/ardour2/branches/3.0@13972 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 18:27:13 +00:00
2a2b48ef66
start passing around the (possibly-bundle-modified) localedir so that we call bindtextdomain() correctly, and thus (hopefully) find message catalogs correctly inside a bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 23:14:00 +00:00
76f74b9c88
force jack-disconnected dialog to top ( fixes #5291 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 13:13:02 +00:00
2bc6b777c6
use a warning dialog, nto a question dialog, for sample rate mismatch
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-14 21:45:55 +00:00
b1029a3caf
goodbye pixmaps and pixbufs (no longer) used by Gtkmm2ext::PixFader
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13827 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-10 15:25:11 +00:00
78ff7399cb
Fix three little typos.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13799 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 19:15:02 +00:00
5d7ee9bbaa
disclose i18n conspiracy.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13788 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 13:58:37 +00:00
d949d01780
mixed-track plural form.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13785 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 12:54:30 +00:00
bb3690db58
merge Marcel Bonnet's patches for Free-BSD
...
(may need further cleanup:
compare with timbyr's windows patch,
verify fst/vsti + ALSA)
git-svn-id: svn://localhost/ardour2/branches/3.0@13774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 17:36:52 +00:00
b938923bad
use correct plural forms
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13772 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 16:49:21 +00:00
599d7f66e4
use new plural form macro
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-03 14:19:31 +00:00
dc80a11432
various i18n fixes and updates after a ./waf i18n run
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13758 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-03 13:32:11 +00:00
b5431ab2fc
fix previous clock fix, having noticed use of connect_seconds()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 16:57:34 +00:00
5c847268af
colin's wall clock patch update, modified to update every second, not every millisecond
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13732 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 16:44:09 +00:00
e9f1b1287b
make "OK" button in memory-limit dialog be the default widget so that return closes the dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13688 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-19 22:16:58 +00:00
341cbfbd19
reinstate the windows way for GUIIdle's but limit the scope of the connection to just the time when a long-running action is active (for now, just adding > 8 routes)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 13:44:11 +00:00
fa746f4d97
revert that GUIIdle signal till i track down a deadlock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-12 19:18:27 +00:00
75f3005c67
sometimes, you just have to do what a windows programmer would do. add a global signal, ARDOUR::GUIIdle() which can be used in the middle of long-running backend operations to give the GUI a chance to update. use it while adding routes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-12 18:59:47 +00:00
