fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
c94f0b6298
updated DE translation from edgar aichinger
2013-10-08 12:22:49 -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
22eea8e9e2
possible relief for snapshot loading
2013-10-07 20:46:10 -04:00
2230dc92cd
remove debug output
2013-10-07 20:30:28 -04:00
c727d18b80
delete the UI from main() to get full cleanup
2013-10-07 20:28:20 -04:00
5d85b5257e
use new GtkUI design in ARDOUR_UI
2013-10-07 20:27:54 -04:00
7ac849689d
window proxy should delete its window during its destructor
2013-10-07 20:17:49 -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
df2b5c90e4
'gtk2_ardour' - In 'Note' c'tor, don't try to set 'rectangle->name' unless 'CANVAS_DEBUG' is defined
2013-10-06 11:00:10 +01:00
e93c425d6f
'gtk2_ardour' - One further Glib::usleep needed
2013-10-06 10:52:41 +01:00
7f4ed54f53
'gtk2_ardour' - Some further casting
2013-10-06 10:50:45 +01:00
449f600c69
remove another unnecessary use of libgen.h
2013-10-04 13:02:41 -04:00
ddcb78f3e2
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least), part 2
2013-10-04 13:00:59 -04:00
028cd5660f
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least)
2013-10-04 12:50:03 -04:00
1344014cbd
switch from MAXPATHLEN to PATH_MAX, and use <limits.h> not <sys/param.h> for portability
2013-10-04 12:46:31 -04:00
6daa7c1bc3
remove unnecessary header include
2013-10-04 12:46:02 -04:00
74f3955682
remove OSC related cruft from ardour_ui_options.cc
...
control surface activation is handled via an entirely separate mechanism now
2013-10-04 11:46:50 -04:00
da628185b1
'gtk2_ardour' - Make sure that 'getpid()' can be found when building with MSVC
2013-10-03 09:57:25 +01:00
5da78cea9a
'gtk2_ardour' - Use 'const_iterator' where appropriate, instead of 'iterator'
2013-10-03 09:52:39 +01:00
bc2b2f9e35
'gtk2_ardour' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC
2013-10-03 09:50:34 +01:00
904367748c
'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8)
2013-10-03 09:48:19 +01:00
f763e370c5
'gtk2_ardour' - When building with MSVC, use 'std::min' + 'std::max' rather than 'fmin' + 'fmax'
2013-10-03 09:43:55 +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
d7a16f7de6
'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
2013-10-03 09:12:02 +01:00
f8574fc39d
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
2013-10-03 09:06:56 +01:00
d382925fba
Add a header file guard (to prevent multiple #inclusion)
2013-09-26 15:17:40 +01:00
d614dc1e18
Deliberately specify 'Gtk::manage' where necessary (avoids creating ambiguities when we #include this header file elsewhere)
2013-09-26 11:47:17 +01:00
4f4a53e870
A further change which needs to be tested on the other compilers
...
(splitting a long string into 2 x concatenated strings)
2013-09-26 11:01:15 +01:00
a88f38cf10
'gtk2_ardour (msvc)' - Some changes needed before anything at all will compile
...
For the most part, the compilation problems are caused by lines such as:-
WM::Proxy<ThemeManager> theme_manager;
Before MSVC will compile the above it needs to know that the specified object type contains an appropriate (i.e. publicly available) default c'tor. Therefore the corresponding header file needs to get #included, rather than just declaring that type to be a class (whilst all classes have a default c'tor, it needn't necessarily be public). The remaining changes are mostly minor.
This commit should be tested ASAP to make sure it doesn't upset the other compilers.
2013-09-26 10:58:07 +01:00
d0b67dce80
fix crash when cmdline provides session name
2013-09-24 22:22:16 -04: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
f7b6a27de6
shrink small-splash.png image by 50%
2013-09-23 23:12:42 -04:00
0f6ba422f6
use new Session API to show session SR and disk bit depth in recent sessions list
2013-09-23 21:36:13 -04:00
cff174b541
move rate_as_string() from EngineControl to utils.cc
2013-09-23 21:35:17 -04:00
884789bfad
move announcements frame around in the session dialog and adjust spacing/borders
2013-09-23 16:49:24 -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
20f28c82ec
make session creation from a template work again
2013-09-22 11:19:34 -04:00
04d66a9e3a
remove use-session-as-template option from new session dialog and fix ability to not use a template
...
Note: using a template is still not actually working ...
2013-09-21 13:56:59 -04:00
e33b29d672
make sure the template selector has an item visible if there are any
2013-09-21 13:22:06 -04:00
482a90cccf
apply same always-check-display to recent sessions scroller in new session dialog
...
It turns out that we always create a new ArdourStartup right now, so this and the previous commit
are not actually necessary, but they do pave the way for keeping the dialog around instead
2013-09-21 13:14:33 -04:00
2577bf55c9
reset the visibility of the template selector stuff every time the startup/NSD gets mapped, so that it is always current
2013-09-21 12:51:30 -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
461f94a3a1
if new session button clicked, clear any selection in recent sessions and mark browser unused
2013-09-20 16:45:04 -04:00
53bd17d938
move advanced new session options into an expander, change some wording
2013-09-20 16:05:54 -04:00
