smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity
15066 commits 103 branches 145 tags 315 MiB
Commit graph

288 commits

Author SHA1 Message Date
Mykola
21f110759f [Summary] Show "rec enable button", "mute button", "solo button", "input monitoring button" in the Inspector if track is not Muster track 
[Reviewed] GZharun
 2014-09-30 16:26:37 +03:00
Paul Davis
56890964ec change return value for several RouteUI:: button press handlers so that WavesButton::on_button_press_event() is still called. 
This is needed so that the focus handling part of the WavesButton method gets invoked, without us having to add it on
a case-by-case basis. This change was made in Ardour on August 22nd 2014 for unrelated reasons.
 2014-09-17 09:27:34 -04:00
nikolay
101fec83a5 [Summary] Fix crash on close session 
[Reviewed] GZharun
 2014-09-15 14:25:39 +03:00
GZharun
b52ae60624 [Summary] Added DnD flags for track header targets: DnD operation could happen within one app between different widgets (cannon drop to yourself) 2014-09-09 17:39:57 +03:00
GZharun
410bd658e3 [Summary] Fixed DnD signal connection issue 2014-09-09 17:19:47 +03:00
Paul Davis
af4a72b2d1 fix rec-enable button action 2014-09-04 07:41:07 -04:00
Paul Davis
4a1b09b6c1 Merge branch 'master' into ardour-merge 2014-09-02 13:07:42 -04:00
nikolay
b7afba12ba [Summary] Set default color to track headers on new session 
[Reviewed] GZharun
 2014-09-02 19:27:21 +03:00
Paul Davis
31d500e3a9 Merge branch 'master' into ardour-merge 
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
	gtk2_ardour/mixer_strip.cc
	gtk2_ardour/route_time_axis.cc
	gtk2_ardour/route_ui.h
	gtk2_ardour/ui/audio_time_axis.xml
	gtk2_ardour/ui/editor_mixer.xml
	gtk2_ardour/ui/meter_strip.xml
	gtk2_ardour/waves_button.cc
	gtk2_ardour/waves_button.h
	gtk2_ardour/waves_zoom_control.cc
	gtk2_ardour/waves_zoom_control.h
 2014-08-27 12:38:27 -04:00
Greg Zharun
78319da918 [Summary] Fixed bug with uninitialized class member 2014-08-21 18:40:52 +03:00
GZharun
4d9d7b933e [Summary] Resolved conflicts of track header DnD with other operations 2014-08-21 17:41:34 +03:00
Greg Zharun
e8be86537f [Summary] Added flag to indicate DnD operation is in progress 2014-08-21 14:46:58 +03:00
GZharun
2a5f669c45 [Summary] DnD for track headers in editor, version 1.0 
[Details] Track headers became reorder able by DnD
 2014-08-21 12:22:53 +03:00
nikolay
1ed4ea684b [Summary] Fix bug with master's color 
[Reviewed] GZharun
 2014-08-21 12:19:25 +03:00
nikolay
0f59999c43 [Summary] Changed default color for new added tracks and for master 
[Reviewed] GZharun
 2014-08-20 14:07:58 +03:00
VKamyshniy
fdc2334cee [Summary] implementing differences in layouts for track and master. 2014-08-19 13:58:12 -04:00
VKamyshniy
7b5169af31 [Summary] implementing differences in layouts for track and master. 2014-08-19 13:47:04 -04:00
Paul Davis
8e79c77dfc remove awful, inobvious, wrong and no longer necessary "_i_am_the_modifier" crap from RouteUI, except in one case where it might be useful 
Conflicts:
	gtk2_ardour/route_ui.cc
 2014-08-17 21:11:57 -04:00
Paul Davis
2bdb343843 manually fix up cherry-pick mess after several cherry-picks with no compile checks 2014-08-17 20:29:12 -04:00
Robin Gareus
94632100a6 suspend route redisplay for (rec-en, solo, mute and monitor) batch changes 
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/route_ui.cc
 2014-08-17 19:56:45 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace 
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
 2014-08-17 18:51:22 -04:00
Paul Davis
72d9c38702 substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring. 
Group tabs now also get the text drawn in an appropriately contrast-y color

Conflicts:
	gtk2_ardour/region_view.cc
	gtk2_ardour/time_axis_view_item.cc
 2014-08-17 15:02:28 -04:00
GZharun
d2135c25a8 [SUMMARY] Changed track numbering and hided number for master track 2014-08-13 13:49:08 +03:00
nikolay
6270ee768f [Summary] Added menu item "Delete selected tracks". Refactoring of the RouteUI::remove_this_route(). Bug fix in top bar (set menu items "Move this track up/down" not selectable in case of Master was selected). 
[Reviewed] GZharun
 2014-08-13 11:21:11 +03:00
nikolay
faf47b3b78 [Summary] 
1. Changed Ardour's random color generator to Tracks's
MixerStrip::palette_random_color()
2) Apply selected color to all activated routes
MixerStrip::color_button_clicked (WavesButton *button)
3) Set black default color to new added tracks
[Review] GZharun
 2014-08-08 13:13:04 +03:00
GZharun
a3a2ca7541 [Summary] Reworked input monitoring as required by Tracks PRD. 
[Details] Please, note, that track.cc file was changed during this reworking.
 2014-07-30 21:19:44 +03:00
nikolay
c9949a0399 [Summary] Fix bug in Track Header (on OS Windows). In the past Shift+Click set SoloButton in Solo Save Mode. Now Ctrl+Click set Solo Button in Solo Save Mode (according to PRD). 
[Review] Nobody
 2014-07-22 17:48:49 +03:00
nikolay
229f5a34ef [Summary] Fix bug in Track Header. In the past Shift+Click set SoloButton in Solo Save Mode. Now Ctrl+Click set Solo Button in Solo Save Mode (according to PRD). 
[Review] Nobody
 2014-07-22 11:56:06 +03:00
VKamyshniy
c666cd922f [Summary] Fixing the following bugs: 
- INSPECTOR's Mixer Strip should be "NO SELF DESTRUCT"
- When a RouteUI object is non-self-destruct, it should "reset ()" instead of "delete this";
 2014-07-20 22:25:23 +03:00
nikolay
be0d2210cc [Summary] Delete context menu in Track Header and Inspector 
[Review] GZharun
 2014-07-18 12:41:58 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
c171f328a2 [Summary] Implementing TRACK Header and Inspector UI 2014-07-08 14:57:47 +03:00
VKamyshniy
9958f084e5 [Summary] Implementing TRACK Header and INSPECTOR UI 2014-07-08 12:12:12 +03:00
VKamyshniy
72ea39fe5a [Summary] Implementing Color selection in the inspector 2014-07-08 01:03:46 +03:00
VKamyshniy
6e3cdd4023 [Summary[Summary] Implementing TRACK Header UI 2014-07-07 15:16:34 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT 
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
 2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
a26f056cdd [P4/git history rebuild] Remove use of Stock:: item (NOTE: this is a highly questionable edit) 2014-05-27 21:31:04 -04:00
Paul Davis
49d9397770 manually apply d697a31abf from master (git could not apply cleanly) 2014-02-19 23:44:53 -05:00
Paul Davis
a0abf608d6 replace a few creeping instances of the string "Ardour" with PROGRAM_NAME 2014-02-10 10:53:01 -05:00
Paul Davis
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
nick_m
5b62e88fbf Unify editor / mixer ordering. 2013-10-21 00:19:43 +11:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
Paul Davis
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
Paul Davis
fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
Robin Gareus
9b091a52cb clean up 44fc92c3 (not a threading issue but sigc++ problem) 
RouteUI is not sigc::trackable itself (only derived classes are)
RouteUI::~RouteUI() does not disconnect from signals on destruction.
 2013-07-30 17:54:52 +02:00
Robin Gareus
44fc92c33d disconnect AuxSend connection when deleting bus 
fixes crash:
 - add bus
 - aux-send a signal to that bus
 - delete bus
 - add another bus
 - aux-send a signal to "another bus"
 - click "Aux Send" button on "another bus"
 - crash
 2013-07-30 15:12:32 +02:00
Robin Gareus
8013160eb3 meterbridge metrics update: 
* display metrics for every used meter-type
* show metrics between meters with differnet types
* update text and label alignment for meterbridge
* fix crash when deleting metrics-strip (zero route)
* clean up metric pattern code (use float for dBFS)
 2013-07-23 13:30:23 +02:00
Paul Davis
c08b336292 Fix ambiguous type CheckMenuItem that is also defined via windows.h 2013-07-11 15:32:31 -04:00