Paul Davis
be4337689e
make import dialog non-modal
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13717 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23 18:25:26 +00:00
Robin Gareus
92a2b8cb3f
more freesound UI tweaks:
...
* shrink filename column between searches
* match-count: translatable sigular/plural forms
git-svn-id: svn://localhost/ardour2/branches/3.0@13703 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 20:26:48 +00:00
Robin Gareus
09f5940c8c
freesound: tom's diner^Wprogress bar
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13702 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 19:32:21 +00:00
Robin Gareus
57b673a9d7
freesound display license
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13701 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 19:32:19 +00:00
Robin Gareus
6d57f7e926
freesound import - various small tweaks
...
* quote search string
* show filesize
* include samplerate in list
* filter out mp3s on Linux
* decrease layout-spacing and shorten progressbar txt.
git-svn-id: svn://localhost/ardour2/branches/3.0@13700 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 17:28:44 +00:00
Robin Gareus
51091b2cf9
freesound: break page-request loop if search result is empty.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13699 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 14:26:10 +00:00
Paul Davis
98834c0532
remove a bunch of cerr output and/or convert to use error<<
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
Paul Davis
a541e4e811
escape markup text that may contain non-legal characters (for GMarkup). this may need to be done more widely
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-23 14:45:09 +00:00
Paul Davis
a64a79b72c
change packing/design/sizing/labels at bottom of import dialog (should fix #5062 and looks a bit prettier even in english)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13316 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-22 15:31:42 +00:00
Tim Mayberry
105caf23da
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
Carl Hetherington
46f594ac83
Make sure we always copy Freesound imported files as well as MIDI ones ( #4675 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-19 21:40:06 +00:00
Carl Hetherington
508b5fa341
Disallow import-without-copy for MIDI files ( #4148 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-18 23:42:54 +00:00
Carl Hetherington
1c2951e0ea
Use preview filename rather than the first-alphabetically-sorted filename for preview in the import dialogue; should fix #4921 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12715 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 21:32:48 +00:00
Carl Hetherington
6624f9be37
Move delta-to-edit-point options to the main clock context menus ( #4472 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 23:14:03 +00:00
David Robillard
6fa6514cfd
Remove over 500 unnecessary includes (including 54 of session.h).
...
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff). I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.
This commit only targets includes of ardour/*.h. There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.
git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
Paul Davis
e47dfc0c1e
when resetting the import dialog based on selceted track counts, change the file chooser filter to match a clear selection of a a particular track type ( #4880 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12351 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-21 09:13:59 +00:00
Carl Hetherington
89aa30c151
Add a new import file filter for audio and MIDI and use it by default (should fix #4880 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-17 10:58:00 +00:00
Carl Hetherington
0860570c8c
Fix a few unchecked XML child / property lookups
...
(#4814 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@11894 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 10:51:21 +00:00
Ben Loftis
164db566b0
various tweaks to Freesound UI and code. keep a single mootcher to speed up operations; add text to progress bar, stop storing xml files, auto-increment pages until user clicks stop.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11801 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-05 21:31:55 +00:00
Carl Hetherington
c23a34a5a5
Freesound tweaks from colinf ( #4761 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 22:02:48 +00:00
Paul Davis
577469a06a
colinf's 2011-12-08 patch for freesound mootcher (add stop, remove URI, clear barberpole, etc)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 18:43:43 +00:00
David Robillard
e70249ab65
Pack toolbar combo boxes with expand=false and remove size kludges.
...
Turns out gtk these days sizes combo boxes with precisely enough space if
packed to not expand, none of this mess is necessary any more.
git-svn-id: svn://localhost/ardour2/branches/3.0@10790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 08:35:41 +00:00
Paul Davis
b25fbc8a95
all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-17 22:49:13 +00:00
Paul Davis
f1ed13ee4d
allow compilation without --freesound
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10597 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 22:17:31 +00:00
Paul Davis
1d984b7985
the return of basic FreeSound mootcher functionality, c/o colinf. lots of bugs and workflow issues to still resolve, but good to play with. remember that ardour can't play mp3's
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 22:04:14 +00:00
Paul Davis
8fb9e72a77
allow import to selected MIDI tracks (note that this gets confused if the MIDI file contains multiple MetaTracks - each track ends up in the same track, which may or may not be the right thing)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-26 17:22:10 +00:00
Paul Davis
83f385d263
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:50:37 +00:00
David Robillard
ed626628b5
Delete trailing whitespace
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
73192bc1a7
Remove all use of nframes_t.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
Paul Davis
b85b4d9e54
make ardour3 build and link on OS X (tiger, at least)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
Paul Davis
8df3e242be
ellipsize file name at top of preview pane; allow a bit more room for file format text in preview pane
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7971 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-05 16:18:40 +00:00
Paul Davis
ede4ecbb00
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 18:20:37 +00:00
Paul Davis
da8eec7a83
remove Glib::ustring from gtk2_ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
Carl Hetherington
57ec614531
Reset the available import dialogue menu options when a selection is made from the channel_combo. Sort-of fixes #3397 , in that you can select to selected tracks' option on the add files menu even if the number of selected tracks is not the same as the number of imported files.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-30 00:54:02 +00:00
Paul Davis
b2bf4eee3d
2.X commits up to and including 7519
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-20 22:36:35 +00:00
Paul Davis
f5c4c8a293
forward port 2.X changes up to and including rev 6767
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 00:28:20 +00:00
Carl Hetherington
ed74a89820
Give a better message to warn of unsupported MIDI file audition.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7121 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 23:36:40 +00:00
Carl Hetherington
e55f93ff61
Fix #3077 properly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:57:35 +00:00
Carl Hetherington
44b639b475
Add missing string to disposition_map. Fixes #3077 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6969 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-23 01:41:44 +00:00
Paul Davis
dc815ea8e8
forward-port from 2.X commits 5827-6000 including
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6914 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-15 20:42:05 +00:00
Paul Davis
6ef5d85ae1
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 15:33:04 +00:00
Paul Davis
ce7a5e1c9f
the Properties & 64bit region commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 13:59:49 +00:00
Paul Davis
f6fdd8dcbf
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
Paul Davis
64dc5427e4
make all use of bind/mem_fun be explicitly sigc::
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 23:29:48 +00:00
Paul Davis
c38e02285f
major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI and AbstractUI; solo & mute are both temporarily broken; OSC control up next; may segfault during exit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 03:05:14 +00:00
Paul Davis
4a3d7877f6
cross-thread handling of SessionEvent allocation/deallocation, with widespread consequences
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 19:24:09 +00:00
Carl Hetherington
12c9728530
Make processor box send faders adjust their size correctly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 17:45:11 +00:00
Paul Davis
acdc88f279
attempt to remove confusion and errors caused by unclear semantics of _is_embedded for FileSources; member renamed _within_session, and is now ALWAYS determined by the _path of the FileSource, never by the creator
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:16:38 +00:00
Carl Hetherington
7664d86dc5
Fix #2931 ; redundant menu items on main clocks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 02:15:44 +00:00
Paul Davis
fa5aeb7892
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 14:38:58 +00:00
David Robillard
bb9cc45cd2
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
...
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
Carl Hetherington
b65f8073ba
Fix some unused parameter warnings.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:17 +00:00
Paul Davis
f411496289
fix clicking when processors become active/inactive; reduce crazy 2.5sec delay for quit dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 14:39:21 +00:00
Paul Davis
88beef2e93
merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-13 00:26:28 +00:00
Carl Hetherington
e3897af5e3
Stop the import dialog's size changing when a file is selected.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 15:53:45 +00:00
Paul Davis
e6eb059576
the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-09 20:21:19 +00:00
Carl Hetherington
015fc7b39f
First stage of options rework.
...
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.
- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.
- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.
git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-14 00:13:27 +00:00
Carl Hetherington
d76a5d9958
A few small layout cleanups.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5044 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:36:45 +00:00
David Robillard
0c0e689d3c
Waf building of gtk2_ardour.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:21:49 +00:00
David Robillard
e0aaed6d65
*** NEW CODING POLICY ***
...
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.
Do this:
#include "ardour/types.h"
NOT this:
#include <ardour/types.h>
Rationale:
This is best practice in general, to ensure we include the local version
and not the system version. That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.
More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly. That is:
!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!
Failure to comply is punishable by death by torture. :)
P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).
git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:26:51 +00:00
David Robillard
c9582da233
Make source length a dynamic thing.
...
Update MIDI region length (actually and visually) when position changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@4644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-20 00:30:42 +00:00
David Robillard
022818b4a7
Fix the horrible mess that was anything related to sources and paths.
...
Most significant changes:
- Factor out FileSource from AudioFileSource, use for SMFSource too
- Explicitly pass embedded rather than mysterious name mangling or whatever
- Destroy a ton of duplicated or very-nearly-duplicated code
- Clean up and document all that weird source stuff in session.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@4609 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 02:11:49 +00:00
David Robillard
900309993c
Move duplicated AudioFileSource::Flags and SMFSource::Flags into Source.
...
Clean up source stuff.
git-svn-id: svn://localhost/ardour2/branches/3.0@4605 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 18:08:22 +00:00
Carl Hetherington
4e1f451520
Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-18 19:31:00 +00:00
Paul Davis
bc89fe0147
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
Paul Davis
3be16e8afb
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 16:07:28 +00:00
David Robillard
9a30bb2aec
Separate low level details of SMF reading/writing from concept of 'midi source in ardour'.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-30 00:45:26 +00:00
David Robillard
2d5163d099
Show file selector in import dialog (how that one happened I don't know).
...
MIDI import works, but is sloooooooooowwwwwwwww for some reason...
git-svn-id: svn://localhost/ardour2/branches/3.0@3789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-22 17:24:39 +00:00
Paul Davis
c86210a9d5
merge 2.0-ongoing into 3.0 @ 3581 - 3710
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 21:27:39 +00:00
Paul Davis
68e943265e
merge from 2.0-ongoing @ 3581
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 15:03:30 +00:00
David Robillard
da45f489dd
Fixes for GCC 4.3.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 18:35:05 +00:00
Paul Davis
cb41314642
merge 3.0 from 2.0-ongoing@3243
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
Paul Davis
997e4b1f9c
merge with 2.0-ongoing @ rev 3147
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
David Robillard
0d0bd81a75
Fix timing on MIDI import.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 00:15:20 +00:00
David Robillard
fbfb26b45c
Preliminary (read: kludgey) MIDI import support.
...
Only really works when tracks contain only channel 1 data for now.
git-svn-id: svn://localhost/ardour2/branches/3.0@3083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 19:45:52 +00:00
David Robillard
bb457bb960
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
...
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
Paul Davis
b01bdb7e70
merged with trunk revs 2605-2627
...
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 22:23:01 +00:00
Paul Davis
df20e5935f
stop auto-play from trying to play things that are not soundfiles
...
git-svn-id: svn://localhost/ardour2/trunk@2603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 05:09:10 +00:00
Carl Hetherington
61fad5fd44
Patch from jdavisp3 to fix #1894
...
git-svn-id: svn://localhost/ardour2/trunk@2592 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-05 16:57:19 +00:00
Paul Davis
f7f9d6fdc4
merge from 2.0-ongoing by hand, minus key binding editor
...
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 22:07:47 +00:00
Paul Davis
e6c3ff40c4
add alternate filters for soundfile browser
...
git-svn-id: svn://localhost/ardour2/trunk@1848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-16 02:21:41 +00:00
David Robillard
99904735e0
Merged with trunk R1612.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 06:07:08 +00:00
David Robillard
f9f5ec85fb
Merged with trunk R1393.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 17:44:13 +00:00
David Robillard
f7563c2b15
Merged with trunk R1304
...
git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 19:50:49 +00:00
David Robillard
532f6aad4a
Merged with trunk R1283.
...
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 23:24:54 +00:00
David Robillard
ef6b25432d
Merged with trunk R1141
...
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 16:45:16 +00:00
David Robillard
fedf3d34f3
Merged with trunk R992.
...
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 19:01:50 +00:00
David Robillard
7bd41538d9
Merged with trunk R920.
...
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-19 03:29:16 +00:00
David Robillard
017e16c530
Merged with trunk R879
...
git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 19:17:00 +00:00
David Robillard
82232f06ba
Merged with trunk R861
...
Possible new bugs - not very thoroughly tested, but at least functional at first glance
git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-29 21:21:48 +00:00
David Robillard
0565c75ce8
Merged up to trunk R732
...
git-svn-id: svn://localhost/ardour2/branches/midi@735 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-01 19:18:12 +00:00
David Robillard
8277d134b9
Merged with trunk R708
...
git-svn-id: svn://localhost/ardour2/branches/midi@712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-28 01:08:57 +00:00
David Robillard
fe13d08874
Large nasty commit in the form of a 5000 line patch chock-full of completely
...
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 16:01:34 +00:00
David Robillard
b5db1f624d
Merged with trunk revision 600
...
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 01:34:54 +00:00
David Robillard
868f557f26
Merged with trunk (painfully)
...
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-13 07:27:52 +00:00
Taybin Rutkin
c67a576d61
Improved sfdb API.
...
Eliminated some warnings on Darwin.
Added libxslt to scons.
git-svn-id: svn://localhost/trunk/ardour2@494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-07 17:17:38 +00:00
Taybin Rutkin
49ab3aa0b3
All included libraries now link dynamically instead of statically.
...
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.
git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 20:23:50 +00:00
Nick Mainsbridge
dcd4c89f34
Prompter now prevents blank strings or unaltered names & now has a horizontal orientation. Rename marker now uses the ArdourPrompter.
...
git-svn-id: svn://localhost/trunk/ardour2@463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-22 15:28:59 +00:00
Nick Mainsbridge
d7e728476a
Add a stock question image to the choices dialog, other general dialog love.. Forgot to mention that in the last commit the default snapshot name has been modified for slightly better alphabetical sorting goodness (year is now first, weekday last).
...
git-svn-id: svn://localhost/trunk/ardour2@459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-20 11:41:45 +00:00
Nick Mainsbridge
8ca561f8d3
Change ArdourPrompter to not have an OK button by default, clean up new track/bus dialog and change 'affirmative' button on ArdourPrompter dialogs, make 'jack isn't running' dialog a MessageDialog, standardise some capitalisation, add stock buttons to plugin selector, fix layout of presets in plugin_ui. Fix 'rename range' dialog.
...
git-svn-id: svn://localhost/trunk/ardour2@458 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-19 20:42:17 +00:00
Taybin Rutkin
dca6c6d91f
Added tooltips to help explain various soundfilebrowser buttons.
...
Fixed auditioning for SoundFileChooser and SoundFileOmega.
git-svn-id: svn://localhost/trunk/ardour2@453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-12 03:09:25 +00:00
Paul Davis
3aa346b253
significant changes in code to handle import/embedding - much cleaner and less code, plus the import progress bar now works; unify response handling for Gtkmm2ext::Choice
...
git-svn-id: svn://localhost/trunk/ardour2@415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-22 17:03:00 +00:00
Taybin Rutkin
1e668dfaf2
ExternalSource refactoring.
...
git-svn-id: svn://localhost/trunk/ardour2@373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10 17:09:59 +00:00
Taybin Rutkin
123ec9cb30
Removed direct libsndfile usage.
...
git-svn-id: svn://localhost/trunk/ardour2@362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08 22:24:51 +00:00
Doug McLain
671967bfac
removed redundant include that I accidentally committed
...
git-svn-id: svn://localhost/trunk/ardour2@347 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05 10:56:44 +00:00
Doug McLain
b62c348c88
another get_vbox() fix, this time for PortSelectorWindow
...
git-svn-id: svn://localhost/trunk/ardour2@346 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05 10:24:31 +00:00
Taybin Rutkin
2a25079173
Removing fields from the sfdb works. Dialog is fully functional as presented.
...
git-svn-id: svn://localhost/trunk/ardour2@276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-18 21:05:59 +00:00
Taybin Rutkin
9747fa8910
All useage of ArdourPrompter checks for a valid result.
...
Gtkmm2ext::Prompter set as WINDOW_TYPE_HINT_DIALOG.
Adding fields to the sfdb works.
git-svn-id: svn://localhost/trunk/ardour2@271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-13 22:46:04 +00:00
Taybin Rutkin
6817b59169
Moved strip_whitespace_edges() to pbd/whitespace.h
...
Gtkmm2ext::Prompter::get_result() calls strip_whitespace_edges(), so you don't have to.
Removed unused/unecessary/forgotten headers from libpbd.
git-svn-id: svn://localhost/trunk/ardour2@270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-13 19:48:55 +00:00
Paul Davis
e3084f1f1b
minor include fix for <errno.h>
...
git-svn-id: svn://localhost/trunk/ardour2@266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-12 03:57:56 +00:00
Taybin Rutkin
9a951bcd20
Use compiler provided __BIG_ENDIAN__ instead of WORD_BIGENDIAN
...
Auditioning in sfdb_ui works.
CoreAudioSource updates.
git-svn-id: svn://localhost/trunk/ardour2@263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-11 21:27:59 +00:00
Taybin Rutkin
18844bac7a
sfdb displays file info.
...
git-svn-id: svn://localhost/trunk/ardour2@243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-05 05:15:29 +00:00
Taybin Rutkin
fd20404daa
Updates for set_type_hint() and the sfdb_ui.
...
git-svn-id: svn://localhost/trunk/ardour2@239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 05:53:51 +00:00
Taybin Rutkin
9f91aca762
And back again.
...
git-svn-id: svn://localhost/trunk/ardour2@182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-08 04:55:46 +00:00
Taybin Rutkin
6039331bea
Part one of the sfdb reworking.
...
git-svn-id: svn://localhost/trunk/ardour2@180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-07 22:57:47 +00:00
Taybin Rutkin
f2c09c7a7a
Dialogbox checkmarks turn off when dialogs are closed.
...
git-svn-id: svn://localhost/trunk/ardour2@164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-02 22:12:56 +00:00
Taybin Rutkin
6772e21f09
ExportDialog compiles. Removed gtkmm.h's.
...
git-svn-id: svn://localhost/trunk/ardour2@71 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-27 19:46:27 +00:00
Taybin Rutkin
fe83d9b77e
sfdb almost done.
...
git-svn-id: svn://localhost/trunk/ardour2@60 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-13 03:48:57 +00:00
Taybin Rutkin
3b91a592be
split sfdb_v3 into 3 classes.
...
git-svn-id: svn://localhost/trunk/ardour2@59 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-12 21:59:45 +00:00
Taybin Rutkin
abb086738c
Start of sfdb_v3.
...
git-svn-id: svn://localhost/trunk/ardour2@58 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-12 20:06:20 +00:00