fa22520fd2
Merge branch 'master' into cairocanvas
2013-11-25 09:26:35 -05:00
c1e8da2e60
Distinguish Save-as and Snapshot dialog window
2013-11-19 15:51:27 +01:00
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
nick_m
f2300164d7
Fix thinko in setting order hint.
2013-10-29 02:04:26 +11:00
5eaafaa3af
further fixes for NSM-based startup
...
Most, move initialization of Audio/MIDI setup window before NSM initialization, to make sure it is available if/when needed
2013-10-27 20:48:48 -04:00
632f5d5231
add error checking and return from attempted NSM-based initialization
2013-10-27 20:32:56 -04:00
nick_m
e80d66c908
Use add_route_dialog's transient_for() window to determine track selection for order_hint.
2013-10-26 02:37:45 +11:00
nick_m
be69bf15dd
New routes are placed after highest selected route.
2013-10-24 01:27:13 +11:00
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -04:00
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
28525d7b69
Forward declare NSM_Client class in ardour_ui.h
...
nsm.h pulls in winsock2.h and with the mingw build and it causes endless
warnings from the compiler
2013-10-21 10:10:40 +10:00
b540d0e4bc
Fix check button handling in Memory Warning Dialog
2013-10-21 10:10:40 +10:00
53bf1a65e8
Fix two minor memory leaks in pending state dialog
2013-10-21 10:10:40 +10:00
58eaab0e42
fix compilation
2013-10-20 09:04:27 -04:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
fa03eee79e
make the startup -> session dialog flow more sensible for brand new users
2013-10-15 12:37:13 -04:00
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
8a4a86eff4
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
2013-10-14 17:05:42 +01:00
be8d06f848
post a dialog about a session being opened in read-only mode (if it happens)
2013-10-12 11:58:22 -04:00
b688dc802f
remove erroneous ` in string
2013-10-12 09:59:33 -04:00
57262331c1
don't use a possibly non-existent window as a transient parent when showing a dialog about engine failure
2013-10-11 15:58:51 -04:00
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
a38c0efbe7
minor tweaks to audio/MIDI setup window
2013-10-10 21:07:17 -04:00
c4b20f1a20
nicely handle the (should-never-happen) case of no audio/MIDI backends being detected
2013-10-10 11:24:16 -04:00
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
19ba3b8de7
fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog
2013-10-08 12:18:27 -04:00
5d85b5257e
use new GtkUI design in ARDOUR_UI
2013-10-07 20:27:54 -04:00
d74255343e
fix up some aspects of loading from a cmdline session name
2013-10-06 16:32:02 -04: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
a19afc5903
'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC)
2013-10-03 09:34:52 +01:00
8bf59e88e5
'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf'
2013-10-03 09:32:08 +01:00
bb062f2b90
'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat'
2013-10-03 09:27:40 +01:00
2c9644320f
tighten up layout of session dialog; make button say cancel or quit in difference scenarios
2013-09-23 23:13:07 -04:00
b362ff220c
major rearrangement of startup/session loading code
...
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
2013-09-23 14:41:52 -04:00
f1aa5839c0
use WindowManager/WMProxy to correctly manage the audio/MIDI setup window
2013-09-22 19:22:56 -04:00
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
57d24608e7
show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set.
2013-09-19 15:03:20 -04:00
20fa19e69e
more excision of "JACK" from labels, menu items, etc.
...
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
2013-09-17 22:25:21 -04:00
fd23ebd088
Merge branch 'master' into cairocanvas
2013-09-17 21:23:30 -04:00
302b08c059
Merge branch 'master' into windows
2013-09-17 21:22:56 -04:00
c698ada035
change return type on {disconnect_from,reconnect_to}_engine() and make public so that we can use these when doing intentional disconnects without popping up the "HALTED" dialog
2013-09-17 21:07:14 -04:00
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
c8b32e2f8b
minor fixups for audio/MIDI setup spin buttons (now editable, as they should be)
2013-09-16 22:03:59 -04:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
ccc81f05be
remove some debug output messages
2013-09-12 17:25:01 -04:00
7c88670680
lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow
2013-09-12 16:28:51 -04:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
209e4bdcae
many changes relating to session construction and audioengine interaction
...
every session member is now initialized using C++ constructor syntax
session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.
if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
2013-09-10 15:41:19 -04:00
56465fda10
move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary
2013-09-09 15:17:42 -04:00
bc1cc154dc
always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running
2013-09-05 14:21:25 -04:00
8060198f75
change names of actions groups that include "jack"
2013-09-04 12:49:52 -04:00
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
e6521bb043
Merge branch 'master' into cairocanvas
2013-08-14 13:11:34 -04:00
6bcdf4f0f1
fix merge issues with master
2013-08-14 13:10:59 -04:00
de4b24b162
Move initialization of libardour from ARDOUR_UI class into main()
2013-08-13 20:15:47 +10:00
d51eba1162
Change ARDOUR::init return type to bool type for success/failure
2013-08-13 20:15:47 +10:00
da74519911
fix display of latency
2013-08-09 11:23:15 -04:00
ab39a09b86
temporarily ignore AudioEngine::Halted when GUI asks to disconnect from JACK, to avoid warning dialog
2013-08-08 22:28:31 -04:00
d90e2b4221
rationalize (a bit) engine start/stop/restart so that it is possible to start up, disconnect from JACK and then reconnect
2013-08-08 16:31:08 -04:00
4c60dd983c
vtl: import audio at video-offset, forget offset on "Remove Video"
2013-08-08 15:26:41 -04:00
9ff32d1b52
make master-meter in toolbar optional
2013-08-08 15:26:41 -04:00
d17c3207b8
add a peak reset button to the editor meter
...
see http://tracker.ardour.org/view.php?id=5601
2013-08-08 15:26:19 -04:00
8f1499664d
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-08-08 15:24:50 -04:00
5ccd13ea78
Wrap calls to add_shortcut_folder() in try { ... } block.
...
Gtk::FileChooserButton::add_shortcut_folder() throws a Glib::Error
exception if the folder being added already has a shortcut, causing the
'New session' dialogue to appear empty when choosing 'New...' from the
Session menu. This happens if Ardour's default session folder is
set to a location that has a standard shortcut in the Gtk file chooser,
e.g. the user's home directory, desktop, &c.
Catch the exception in ArdourStartup::setup_new_session_page(), so that the
'New session' dialogue appears as expected, and likewise in
ARDOUR_UI::open_session() to avoid a similar problem there.
Fixes #5591 .
2013-08-08 15:23:11 -04:00
35fe6dfa08
NOOP - prevent headaches and remove cruft
...
Every "point zero one" seconds is only 25 Hz in ardour..
2013-08-08 15:23:08 -04:00
584eeed66a
change wording in audio status when disconnected from engine
2013-08-07 22:24:30 -04:00
1ab61b8564
major redesign of MIDI port heirarchy and management (part 2)
2013-08-07 22:22:11 -04:00
616f2a0370
fix conflicts after merge with master
2013-08-05 14:22:32 -04:00
a66e3859e1
can now start JACK based on config dialog
2013-08-05 12:51:51 -04:00
7218bd91de
start work on the changes to EngineControl (dialog) to integrate with new backend design, and add "requires-driver" concept to AudioBackend to handle JACK specifically
2013-08-04 14:03:19 -04:00
68fc5bbf6c
vtl: import audio at video-offset, forget offset on "Remove Video"
2013-08-04 17:23:58 +02:00
efc46f1553
make master-meter in toolbar optional
2013-08-04 00:06:29 +02:00
c2e7c32c53
add tim's jack_utils code to rationalize setup of JACK config
2013-08-03 16:37:10 -04:00
1c4d00e8b7
audioengine branch can now load and run at least one test session.
...
currently hard-coded to deal only with the situation where JACK is already running
2013-08-03 11:57:56 -04:00
c06a3a6201
add a peak reset button to the editor meter
...
see http://tracker.ardour.org/view.php?id=5601
2013-08-03 13:59:22 +02:00
df59a000b7
start code reorganization needed to deal with backend choices. compiles, links and runs as far as the startup screen now
2013-08-01 18:49:40 -04:00
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
fbfa0acebe
remove compile errors (still will not link and JACKPortEngine is not close to done)
2013-07-30 23:26:46 -04:00
5e0c6af406
jack_audiobackend.cc finally compiles
2013-07-30 17:48:57 -04:00
b70057f576
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-07-24 22:04:46 +02:00
3d95822716
more miscellaneous changes for audioengine, all of this is still far from actually compiling
2013-07-24 08:36:04 -04:00
bf408d60c8
Wrap calls to add_shortcut_folder() in try { ... } block.
...
Gtk::FileChooserButton::add_shortcut_folder() throws a Glib::Error
exception if the folder being added already has a shortcut, causing the
'New session' dialogue to appear empty when choosing 'New...' from the
Session menu. This happens if Ardour's default session folder is
set to a location that has a standard shortcut in the Gtk file chooser,
e.g. the user's home directory, desktop, &c.
Catch the exception in ArdourStartup::setup_new_session_page(), so that the
'New session' dialogue appears as expected, and likewise in
ARDOUR_UI::open_session() to avoid a similar problem there.
Fixes #5591 .
2013-07-19 12:10:41 +01:00
0444c40053
Use file modes supported by mingw compiler on Windows
2013-07-17 16:45:00 +10:00
c92e1a0742
Use g_lstat instead of lstat for portability
2013-07-17 16:41:48 +10:00
43f7813b24
Fix portability of Session::source_search_path
2013-07-15 08:05:37 -04:00
0aac62e013
Merge branch 'master' into windows
2013-07-14 08:27:22 -04:00
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
167e8bbc2f
Include pbd/localtime_r.h for mingw build
2013-07-11 15:23:12 -04:00
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
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
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
04ad452bca
fix meterbridge window behaviour on session unload/close.
2013-07-10 15:27:03 +02:00
38f2aa51bd
Merge branch 'master' into cairocanvas
2013-07-09 09:11:52 -04:00
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
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
539e58bf5d
possible fix for crash on exit - err on the side of caution
2013-07-07 04:17:04 +02:00
3031a99364
Merge branch 'master' into cairocanvas
2013-06-25 22:24:47 -04:00
11becd4a6b
properly restore newer (cairo-canvas related) UI config parameters
2013-06-21 17:15:56 -04:00
b407b753f7
vtl: remember original video-file for later export/mux
2013-06-17 09:46:01 +02:00
489121ca20
vtl: clean-up "Remove Video" action state
2013-06-13 17:17:28 +02:00
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
6b480bb2f7
vtl: make "Remove Video" insensitive if N/A
2013-06-13 00:58:19 +02:00
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
b8b24e8313
give video-server some time so launch -- prevent multiple instance
2013-06-07 20:14:42 +02:00
cd8180c864
Merge branch 'master' of https://github.com/johnwpoliver/ardour
2013-06-05 13:19:23 -04:00
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
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
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
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
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
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
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
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
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
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02: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
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
