X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=686652c4eb9e055e6cebddc333749a5235d3ad3f;hb=cd87dceb0fda44d7c8fcc2b7844f65def25edb23;hp=a6d538a7bcc86f13c45fd6de26444229ef6fed4a;hpb=79650335d11f2b3c0a0ae51ad971a36cdb28c108;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index a6d538a7bc..686652c4eb 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -71,6 +71,7 @@ #include "about.h" #include "utils.h" #include "gui_thread.h" +#include "meter_xpms.h" #include "i18n.h" @@ -86,686 +87,6 @@ sigc::signal ARDOUR_UI::RapidScreenUpdate; sigc::signal ARDOUR_UI::SuperRapidScreenUpdate; sigc::signal ARDOUR_UI::Clock; -/* XPM */ -static const gchar *h_meter_strip_xpm[] = { -"186 5 187 2", -" c None", -". c #2BFE00", -"+ c #2DFE00", -"@ c #2FFE01", -"# c #32FE01", -"$ c #34FE02", -"% c #36FE02", -"& c #38FE03", -"* c #3BFE03", -"= c #3DFD04", -"- c #3FFD04", -"; c #41FD05", -"> c #44FD05", -", c #46FD06", -"' c #48FD06", -") c #4AFD07", -"! c #4DFD07", -"~ c #4FFD08", -"{ c #51FC08", -"] c #53FC09", -"^ c #56FC09", -"/ c #58FC09", -"( c #5AFC0A", -"_ c #5CFC0A", -": c #5FFC0B", -"< c #61FC0B", -"[ c #63FB0C", -"} c #65FB0C", -"| c #68FB0D", -"1 c #6AFB0D", -"2 c #6CFB0E", -"3 c #6EFB0E", -"4 c #71FB0F", -"5 c #73FB0F", -"6 c #75FB10", -"7 c #77FA10", -"8 c #7AFA11", -"9 c #7CFA11", -"0 c #7EFA12", -"a c #80FA12", -"b c #83FA12", -"c c #85FA13", -"d c #87FA13", -"e c #89FA14", -"f c #8CF914", -"g c #8EF915", -"h c #90F915", -"i c #92F916", -"j c #95F916", -"k c #97F917", -"l c #99F917", -"m c #9BF918", -"n c #9EF818", -"o c #A0F819", -"p c #A2F819", -"q c #A4F81A", -"r c #A7F81A", -"s c #A9F81A", -"t c #ABF81B", -"u c #ADF81B", -"v c #B0F81C", -"w c #B2F71C", -"x c #B4F71D", -"y c #B6F71D", -"z c #B9F71E", -"A c #BBF71E", -"B c #BDF71F", -"C c #BFF71F", -"D c #C2F720", -"E c #C4F720", -"F c #C6F621", -"G c #C8F621", -"H c #CBF622", -"I c #CDF622", -"J c #CFF623", -"K c #D1F623", -"L c #D4F624", -"M c #D6F624", -"N c #D8F524", -"O c #DAF525", -"P c #DDF525", -"Q c #DFF526", -"R c #E1F526", -"S c #E3F527", -"T c #E6F527", -"U c #E8F528", -"V c #EAF528", -"W c #ECF429", -"X c #EFF429", -"Y c #F1F42A", -"Z c #F3F42A", -"` c #F5F42B", -" . c #F8F42B", -".. c #FAF42C", -"+. c #FCF42C", -"@. c #FFF42D", -"#. c #FFF22C", -"$. c #FFF12B", -"%. c #FFF02A", -"&. c #FFEF2A", -"*. c #FFEE29", -"=. c #FFED28", -"-. c #FFEC28", -";. c #FFEB27", -">. c #FFE926", -",. c #FFE826", -"'. c #FFE725", -"). c #FFE624", -"!. c #FFE524", -"~. c #FFE423", -"{. c #FFE322", -"]. c #FFE222", -"^. c #FFE021", -"/. c #FFDF20", -"(. c #FFDE20", -"_. c #FFDD1F", -":. c #FFDC1E", -"<. c #FFDB1E", -"[. c #FFDA1D", -"}. c #FFD91C", -"|. c #FFD71B", -"1. c #FFD61B", -"2. c #FFD51A", -"3. c #FFD419", -"4. c #FFD319", -"5. c #FFD218", -"6. c #FFD117", -"7. c #FFD017", -"8. c #FFCF16", -"9. c #FFCD15", -"0. c #FFCC15", -"a. c #FFCB14", -"b. c #FFCA13", -"c. c #FFC913", -"d. c #FFC812", -"e. c #FFC711", -"f. c #FFC611", -"g. c #FFC410", -"h. c #FFC30F", -"i. c #FFC20F", -"j. c #FFC10E", -"k. c #FFC00D", -"l. c #FFBF0C", -"m. c #FFBE0C", -"n. c #FFBD0B", -"o. c #FFBB0A", -"p. c #FFBA0A", -"q. c #FFB909", -"r. c #FFB808", -"s. c #FFB708", -"t. c #FFB607", -"u. c #FFB506", -"v. c #FFB406", -"w. c #FFB205", -"x. c #FFB104", -"y. c #FFB004", -"z. c #FFAF03", -"A. c #FFAE02", -"B. c #FFAD02", -"C. c #FFAC01", -"D. c #FFAB00", -"E. c #FFA900", -"F. c #F11F00", -"G. c #F21E00", -"H. c #F21C00", -"I. c #F31B00", -"J. c #F31A00", -"K. c #F41800", -"L. c #F41700", -"M. c #F51600", -"N. c #F61400", -"O. c #F61300", -"P. c #F71100", -"Q. c #F71000", -"R. c #F80F00", -"S. c #F90D00", -"T. c #F90C00", -"U. c #FA0B00", -"V. c #FA0900", -"W. c #FB0800", -"X. c #FC0600", -"Y. c #FC0500", -"Z. c #FD0400", -"`. c #FD0200", -" + c #FE0100", -".+ c #FE0000", -"++ c #FF0000", -". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ...+.@.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+", -". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ...+.@.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+", -". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ...+.@.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +++", -". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ...+.@.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +++", -". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ...+.@.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +++"}; - -/* XPM */ -static const gchar * v_meter_strip_xpm[] = { -"5 250 230 2", -" c None", -". c #FE0000", -"+ c #FF0000", -"@ c #FE0100", -"# c #FD0200", -"$ c #FD0300", -"% c #FD0400", -"& c #FC0500", -"* c #FC0600", -"= c #FC0700", -"- c #FB0800", -"; c #FA0900", -"> c #FA0A00", -", c #FA0B00", -"' c #F90C00", -") c #F90D00", -"! c #F80E00", -"~ c #F80F00", -"{ c #F71000", -"] c #F71100", -"^ c #F61200", -"/ c #F61300", -"( c #F61400", -"_ c #F51600", -": c #F41700", -"< c #F41800", -"[ c #F31A00", -"} c #F31B00", -"| c #F21C00", -"1 c #F21E00", -"2 c #F11F00", -"3 c #F54A00", -"4 c #FFA900", -"5 c #FFAB00", -"6 c #FFAC01", -"7 c #FFAD02", -"8 c #FFAE02", -"9 c #FFAF03", -"0 c #FFB004", -"a c #FFB104", -"b c #FFB205", -"c c #FFB406", -"d c #FFB506", -"e c #FFB607", -"f c #FFB708", -"g c #FFB808", -"h c #FFB909", -"i c #FFBA0A", -"j c #FFBB0A", -"k c #FFBC0A", -"l c #FFBD0B", -"m c #FFBE0C", -"n c #FFBF0C", -"o c #FFC00D", -"p c #FFC10E", -"q c #FFC20F", -"r c #FFC30F", -"s c #FFC410", -"t c #FFC511", -"u c #FFC611", -"v c #FFC711", -"w c #FFC812", -"x c #FFC913", -"y c #FFCA13", -"z c #FFCB14", -"A c #FFCC15", -"B c #FFCD15", -"C c #FFCF16", -"D c #FFD017", -"E c #FFD117", -"F c #FFD218", -"G c #FFD319", -"H c #FFD419", -"I c #FFD51A", -"J c #FFD61B", -"K c #FFD71B", -"L c #FFD81C", -"M c #FFD91C", -"N c #FFDA1D", -"O c #FFDB1E", -"P c #FFDC1E", -"Q c #FFDD1F", -"R c #FFDE20", -"S c #FFDF20", -"T c #FFE021", -"U c #FFE222", -"V c #FFE322", -"W c #FFE423", -"X c #FFE524", -"Y c #FFE624", -"Z c #FFE725", -"` c #FFE826", -" . c #FFE926", -".. c #FFEA26", -"+. c #FFEB27", -"@. c #FFEC28", -"#. c #FFED28", -"$. c #FFEE29", -"%. c #FFEF2A", -"&. c #FFF02A", -"*. c #FFF12B", -"=. c #FFF22C", -"-. c #FFF32D", -";. c #FFF42D", -">. c #FDF42C", -",. c #FBF42C", -"'. c #FAF42C", -"). c #F8F42B", -"!. c #F6F42B", -"~. c #F4F42B", -"{. c #F3F42A", -"]. c #F1F42A", -"^. c #F0F429", -"/. c #EEF429", -"(. c #ECF429", -"_. c #EAF528", -":. c #E9F528", -"<. c #E7F528", -"[. c #E5F527", -"}. c #E3F527", -"|. c #E2F526", -"1. c #E0F526", -"2. c #DFF526", -"3. c #DDF525", -"4. c #DBF525", -"5. c #D9F525", -"6. c #D8F524", -"7. c #D6F624", -"8. c #D5F624", -"9. c #D3F624", -"0. c #D1F623", -"a. c #CFF623", -"b. c #CEF622", -"c. c #CCF622", -"d. c #CBF622", -"e. c #C9F621", -"f. c #C7F621", -"g. c #C5F621", -"h. c #C4F720", -"i. c #C2F720", -"j. c #C0F71F", -"k. c #BEF71F", -"l. c #BDF71F", -"m. c #BBF71E", -"n. c #BAF71E", -"o. c #B8F71E", -"p. c #B6F71D", -"q. c #B5F71D", -"r. c #B3F71D", -"s. c #B2F71C", -"t. c #B0F81C", -"u. c #AEF81B", -"v. c #ACF81B", -"w. c #ABF81B", -"x. c #A9F81A", -"y. c #A8F81A", -"z. c #A6F81A", -"A. c #A4F81A", -"B. c #A2F819", -"C. c #A1F819", -"D. c #9FF819", -"E. c #9EF818", -"F. c #9BF918", -"G. c #9AF917", -"H. c #98F917", -"I. c #97F917", -"J. c #95F916", -"K. c #93F916", -"L. c #91F916", -"M. c #90F915", -"N. c #8EF915", -"O. c #8DF914", -"P. c #8BF914", -"Q. c #89FA14", -"R. c #87FA13", -"S. c #86FA13", -"T. c #84FA13", -"U. c #83FA12", -"V. c #81FA12", -"W. c #7FFA12", -"X. c #7DFA12", -"Y. c #7CFA11", -"Z. c #7AFA11", -"`. c #78FA10", -" + c #76FA10", -".+ c #75FB10", -"++ c #73FB0F", -"@+ c #72FB0F", -"#+ c #70FB0F", -"$+ c #6EFB0E", -"%+ c #6DFB0E", -"&+ c #6BFB0E", -"*+ c #6AFB0D", -"=+ c #68FB0D", -"-+ c #66FB0C", -";+ c #64FB0C", -">+ c #63FB0C", -",+ c #61FC0B", -"'+ c #60FC0B", -")+ c #5EFC0B", -"!+ c #5CFC0A", -"~+ c #5AFC0A", -"{+ c #59FC09", -"]+ c #57FC09", -"^+ c #56FC09", -"/+ c #53FC09", -"(+ c #52FC08", -"_+ c #50FC08", -":+ c #4FFD08", -"<+ c #4DFD07", -"[+ c #4BFD07", -"}+ c #49FD07", -"|+ c #48FD06", -"1+ c #46FD06", -"2+ c #45FD05", -"3+ c #43FD05", -"4+ c #41FD05", -"5+ c #3FFD04", -"6+ c #3EFD04", -"7+ c #3CFD04", -"8+ c #3BFE03", -"9+ c #39FE03", -"0+ c #37FE02", -"a+ c #35FE02", -"b+ c #34FE02", -"c+ c #32FE01", -"d+ c #30FE01", -"e+ c #2EFE01", -"f+ c #2DFE00", -"g+ c #2BFE00", -". . + + + ", -". . + + + ", -"@ @ @ @ @ ", -"# # # # # ", -"$ $ $ $ $ ", -"% % % % % ", -"& & & & & ", -"* * * * * ", -"= = = = = ", -"- - - - - ", -"; ; ; ; ; ", -"> > > > > ", -", , , , , ", -"' ' ' ' ' ", -") ) ) ) ) ", -"! ! ! ! ! ", -"~ ~ ~ ~ ~ ", -"{ { { { { ", -"] ] ] ] ] ", -"^ ^ ^ ^ ^ ", -"/ / / / / ", -"( ( ( ( ( ", -"_ _ _ _ _ ", -": : : : : ", -": : : : : ", -"< < < < < ", -"[ [ [ [ [ ", -"} } } } } ", -"} } } } } ", -"| | | | | ", -"1 1 1 1 1 ", -"2 2 2 2 2 ", -"3 3 3 3 3 ", -"4 4 4 4 4 ", -"5 5 5 5 5 ", -"6 6 6 6 6 ", -"6 6 6 6 6 ", -"7 7 7 7 7 ", -"8 8 8 8 8 ", -"9 9 9 9 9 ", -"9 9 9 9 9 ", -"0 0 0 0 0 ", -"a a a a a ", -"a a a a a ", -"b b b b b ", -"c c c c c ", -"d d d d d ", -"d d d d d ", -"e e e e e ", -"f f f f f ", -"g g g g g ", -"g g g g g ", -"h h h h h ", -"i i i i i ", -"j j j j j ", -"k k k k k ", -"l l l l l ", -"m m m m m ", -"n n n n n ", -"n n n n n ", -"o o o o o ", -"p p p p p ", -"q q q q q ", -"q q q q q ", -"r r r r r ", -"s s s s s ", -"t t t t t ", -"u u u u u ", -"v v v v v ", -"w w w w w ", -"x x x x x ", -"x x x x x ", -"y y y y y ", -"z z z z z ", -"A A A A A ", -"A A A A A ", -"B B B B B ", -"C C C C C ", -"D D D D D ", -"D D D D D ", -"E E E E E ", -"F F F F F ", -"G G G G G ", -"G G G G G ", -"H H H H H ", -"I I I I I ", -"I I I I I ", -"J J J J J ", -"K K K K K ", -"L L L L L ", -"M M M M M ", -"N N N N N ", -"O O O O O ", -"P P P P P ", -"P P P P P ", -"Q Q Q Q Q ", -"R R R R R ", -"S S S S S ", -"S S S S S ", -"T T T T T ", -"U U U U U ", -"V V V V V ", -"V V V V V ", -"W W W W W ", -"X X X X X ", -"Y Y Y Y Y ", -"Y Y Y Y Y ", -"Z Z Z Z Z ", -"` ` ` ` ` ", -" . . . . .", -"..........", -"+.+.+.+.+.", -"@.@.@.@.@.", -"#.#.#.#.#.", -"#.#.#.#.#.", -"$.$.$.$.$.", -"%.%.%.%.%.", -"&.&.&.&.&.", -"&.&.&.&.&.", -"*.*.*.*.*.", -"=.=.=.=.=.", -"-.-.-.-.-.", -";.;.;.;.;.", -";.;.;.;.;.", -">.>.>.>.>.", -",.,.,.,.,.", -"'.'.'.'.'.", -").).).).).", -"!.!.!.!.!.", -"~.~.~.~.~.", -"{.{.{.{.{.", -"].].].].].", -"^.^.^.^.^.", -"/././././.", -"(.(.(.(.(.", -"_._._._._.", -":.:.:.:.:.", -"<.<.<.<.<.", -"[.[.[.[.[.", -"}.}.}.}.}.", -"|.|.|.|.|.", -"1.1.1.1.1.", -"2.2.2.2.2.", -"3.3.3.3.3.", -"4.4.4.4.4.", -"5.5.5.5.5.", -"6.6.6.6.6.", -"7.7.7.7.7.", -"8.8.8.8.8.", -"9.9.9.9.9.", -"0.0.0.0.0.", -"a.a.a.a.a.", -"b.b.b.b.b.", -"c.c.c.c.c.", -"d.d.d.d.d.", -"e.e.e.e.e.", -"f.f.f.f.f.", -"g.g.g.g.g.", -"h.h.h.h.h.", -"i.i.i.i.i.", -"j.j.j.j.j.", -"k.k.k.k.k.", -"l.l.l.l.l.", -"m.m.m.m.m.", -"n.n.n.n.n.", -"o.o.o.o.o.", -"p.p.p.p.p.", -"q.q.q.q.q.", -"r.r.r.r.r.", -"s.s.s.s.s.", -"t.t.t.t.t.", -"u.u.u.u.u.", -"v.v.v.v.v.", -"w.w.w.w.w.", -"x.x.x.x.x.", -"y.y.y.y.y.", -"z.z.z.z.z.", -"A.A.A.A.A.", -"B.B.B.B.B.", -"C.C.C.C.C.", -"D.D.D.D.D.", -"E.E.E.E.E.", -"F.F.F.F.F.", -"G.G.G.G.G.", -"H.H.H.H.H.", -"I.I.I.I.I.", -"J.J.J.J.J.", -"K.K.K.K.K.", -"L.L.L.L.L.", -"M.M.M.M.M.", -"N.N.N.N.N.", -"O.O.O.O.O.", -"P.P.P.P.P.", -"Q.Q.Q.Q.Q.", -"R.R.R.R.R.", -"S.S.S.S.S.", -"T.T.T.T.T.", -"U.U.U.U.U.", -"V.V.V.V.V.", -"W.W.W.W.W.", -"X.X.X.X.X.", -"Y.Y.Y.Y.Y.", -"Z.Z.Z.Z.Z.", -"`.`.`.`.`.", -" + + + + +", -".+.+.+.+.+", -"++++++++++", -"@+@+@+@+@+", -"#+#+#+#+#+", -"$+$+$+$+$+", -"%+%+%+%+%+", -"&+&+&+&+&+", -"*+*+*+*+*+", -"=+=+=+=+=+", -"-+-+-+-+-+", -";+;+;+;+;+", -">+>+>+>+>+", -",+,+,+,+,+", -"'+'+'+'+'+", -")+)+)+)+)+", -"!+!+!+!+!+", -"~+~+~+~+~+", -"{+{+{+{+{+", -"]+]+]+]+]+", -"^+^+^+^+^+", -"/+/+/+/+/+", -"(+(+(+(+(+", -"_+_+_+_+_+", -":+:+:+:+:+", -"<+<+<+<+<+", -"[+[+[+[+[+", -"}+}+}+}+}+", -"|+|+|+|+|+", -"1+1+1+1+1+", -"2+2+2+2+2+", -"3+3+3+3+3+", -"4+4+4+4+4+", -"5+5+5+5+5+", -"6+6+6+6+6+", -"7+7+7+7+7+", -"8+8+8+8+8+", -"9+9+9+9+9+", -"0+0+0+0+0+", -"a+a+a+a+a+", -"b+b+b+b+b+", -"c+c+c+c+c+", -"d+d+d+d+d+", -"e+e+e+e+e+", -"f+f+f+f+f+", -"g+g+g+g+g+"}; - static const char* channel_setup_names[] = { "mono", "stereo", @@ -803,8 +124,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) /* transport */ + time_master_button (_("time\nmaster")), + shuttle_units_button (_("% ")), - shuttle_style_button (_("spring")), punch_in_button (_("punch\nin")), punch_out_button (_("punch\nout")), @@ -812,7 +134,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) auto_play_button (_("auto\nplay")), auto_input_button (_("auto\ninput")), click_button (_("click")), - follow_button (_("follow\nPH")), auditioning_alert_button (_("AUDITIONING")), solo_alert_button (_("SOLO")), shown_flag (false) @@ -832,10 +153,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) theArdourUI = this; } - // allow run-time rebinding of accels - - Settings::get_default()->property_gtk_can_change_accels() = true; - ActionManager::init (); m_new_session_dialog = 0; @@ -853,13 +170,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) route_params = 0; option_editor = 0; location_ui = 0; + sfdb = 0; open_session_selector = 0; have_configure_timeout = false; have_disk_overrun_displayed = false; have_disk_underrun_displayed = false; _will_create_new_session_automatically = false; session_loaded = false; - + last_speed_displayed = -1.0f; last_configure_time.tv_sec = 0; last_configure_time.tv_usec = 0; @@ -928,8 +246,19 @@ ARDOUR_UI::set_engine (AudioEngine& e) } if (GTK_ARDOUR::show_key_actions) { - // GTK2FIX - // show_all_actions (); + vector names; + vector paths; + vector keys; + vector bindings; + + ActionManager::get_all_actions (names, paths, keys, bindings); + + vector::iterator n; + vector::iterator k; + for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) { + cerr << "Action: " << (*n) << " bound to " << (*k) << endl; + } + exit (0); } @@ -1091,7 +420,7 @@ If you still wish to quit, please use the\n\n\ } int -ARDOUR_UI::ask_about_saving_session (string what) +ARDOUR_UI::ask_about_saving_session (const string & what) { ArdourDialog window (_("ardour: save session?")); Gtk::Label prompt_label; @@ -1323,218 +652,6 @@ ARDOUR_UI::update_wall_clock () return TRUE; } - -void -ARDOUR_UI::toggle_recording_plugins () -{ - /* XXX use toggle_some_session_state */ - - if (session == 0) { - return; - } - - session->set_recording_plugins (!session->get_recording_plugins()); -} - -void -ARDOUR_UI::toggle_auto_play () - -{ - toggle_some_session_state (auto_play_button, - &Session::get_auto_play, - &Session::set_auto_play); -} - -void -ARDOUR_UI::toggle_auto_return () - -{ - toggle_some_session_state (auto_return_button, - &Session::get_auto_return, - &Session::set_auto_return); -} - -void -ARDOUR_UI::toggle_click () -{ - toggle_some_session_state (click_button, - &Session::get_clicking, - &Session::set_clicking); -} - -void -ARDOUR_UI::follow_changed () -{ - bool x; - - if (!editor) { - return; - } - - if (follow_button.get_active() != (x = editor->follow_playhead())) { - follow_button.set_active (x); - } -} - -void -ARDOUR_UI::toggle_follow () -{ - bool x; - - if (!editor) { - return; - } - - if (editor->follow_playhead() != (x = follow_button.get_active())) { - editor->set_follow_playhead (x); - } -} - -void -ARDOUR_UI::toggle_session_auto_loop () -{ - if (session) { - if (session->get_auto_loop()) { - if (session->transport_rolling()) { - transport_roll(); - } - else { - session->request_auto_loop (false); - } - } - else { - session->request_auto_loop (true); - } - } -} - -void -ARDOUR_UI::toggle_session_punch_in () -{ - if (session) { - session->set_punch_in (!session->get_punch_in()); - } -} - -void -ARDOUR_UI::toggle_punch_out () -{ - toggle_some_session_state (punch_out_button, - &Session::get_punch_out, - &Session::set_punch_out); -} - -void -ARDOUR_UI::toggle_punch_in () -{ - toggle_some_session_state (punch_in_button, - &Session::get_punch_in, - &Session::set_punch_in); -} - -void -ARDOUR_UI::map_button_state () - -{ - map_some_session_state (auto_return_button, - &Session::get_auto_return); - map_some_session_state (auto_play_button, - &Session::get_auto_play); - map_some_session_state (auto_input_button, - &Session::get_auto_input); - map_some_session_state (punch_in_button, - &Session::get_punch_in); - map_some_session_state (punch_out_button, - &Session::get_punch_out); - map_some_session_state (click_button, - &Session::get_clicking); -} - -void -ARDOUR_UI::queue_map_control_change (Session::ControlType t) -{ - ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::map_control_change), t)); -} - -void -ARDOUR_UI::map_control_change (Session::ControlType t) -{ - switch (t) { - case Session::AutoPlay: - map_some_session_state (auto_play_button, &Session::get_auto_play); - break; - - case Session::AutoLoop: - break; - - case Session::AutoReturn: - map_some_session_state (auto_return_button, &Session::get_auto_return); - break; - - case Session::AutoInput: - map_some_session_state (auto_input_button, &Session::get_auto_input); - break; - - case Session::PunchOut: - map_some_session_state (punch_in_button, &Session::get_punch_out); - break; - - case Session::PunchIn: - map_some_session_state (punch_in_button, &Session::get_punch_in); - break; - - case Session::Clicking: - map_some_session_state (click_button, &Session::get_clicking); - break; - - case Session::SlaveType: -// map_some_session_state (mtc_slave_button, &Session::get_mtc_slave); - break; - - case Session::SendMTC: -// map_some_session_state (send_mtc_button, &Session::get_send_mtc); - break; - - case Session::SendMMC: -// map_some_session_state (send_mmc_button, &Session::get_send_mmc); - break; - - case Session::MMCControl: -// map_some_session_state (mmc_control_button, &Session::get_mmc_control); - break; - - case Session::MidiFeedback: -// map_some_session_state (mmc_control_button, &Session::get_mmc_control); - break; - case Session::MidiControl: -// map_some_session_state (mmc_control_button, &Session::get_mmc_control); - break; - - case Session::Live: - break; - - case Session::RecordingPlugins: - break; - - case Session::CrossFadesActive: - break; - - case Session::EditingMode: - break; - - case Session::PlayRange: - break; - - case Session::AlignChoice: - /* don't care, this is handled by the options editor */ - break; - case Session::SeamlessLoop: - /* don't care, this is handled by the options editor */ - break; - - } -} - void ARDOUR_UI::control_methods_adjusted () @@ -1570,54 +687,6 @@ ARDOUR_UI::mmc_device_id_adjusted () #endif } -void -ARDOUR_UI::map_some_session_state (ToggleButton& button, - bool (Session::*get)() const) - -{ - bool x; - - if (session == 0) { - return; - } - - if (button.get_active() != (x = (session->*get)())) { - button.set_active (x); - } -} - -void -ARDOUR_UI::toggle_some_session_state (ToggleButton& button, - bool (Session::*get)() const, - void (Session::*set)(bool)) - -{ - bool button_state; - bool session_state; - - if (session == 0) { - return; - } - - button_state = button.get_active (); - session_state = (session->*get)(); - - if (button_state != session_state) { - (session->*set) (button_state); -#if 0 - - /* check that it worked, and reverse - the button state if it didn't - */ - - if ((session->*get)() != button_state) { - button->set_active (!button_state); - } -#endif - - } -} - gint ARDOUR_UI::session_menu (GdkEventButton *ev) { @@ -1761,7 +830,7 @@ bool ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) { struct stat statbuf; - + if (stat (info.filename.c_str(), &statbuf) != 0) { return false; } @@ -1788,18 +857,25 @@ ARDOUR_UI::open_session () /* popup selector window */ if (open_session_selector == 0) { + + /* ardour sessions are folders */ + open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN); open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_OK); - - FileFilter filter_ardour; - filter_ardour.set_name (_("Ardour sessions")); - filter_ardour.add_pattern("*.ardour"); - open_session_selector->add_filter (filter_ardour); + open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT); + + FileFilter session_filter; + session_filter.add_pattern ("*.ardour"); + session_filter.set_name (_("Ardour sessions")); + open_session_selector->add_filter (session_filter); + open_session_selector->set_filter (session_filter); } - switch (open_session_selector->run ()) { - case RESPONSE_OK: + int response = open_session_selector->run(); + open_session_selector->hide (); + + switch (response) { + case RESPONSE_ACCEPT: break; default: open_session_selector->hide(); @@ -1926,34 +1002,6 @@ ARDOUR_UI::transport_goto_end () } } -gint -ARDOUR_UI::mouse_transport_stop (GdkEventButton *ev) -{ - - - if (session) { - if (session->transport_stopped()) { - session->request_locate (session->last_transport_start()); - } else { - if (session->get_auto_loop()) { - session->request_auto_loop (false); - } - - Keyboard::ModifierMask mask = Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift); - session->request_stop (Keyboard::modifier_state_equals (ev->state, mask)); - } - } - - return TRUE; -} - -gint -ARDOUR_UI::mouse_transport_roll (GdkEventButton* ev) -{ - transport_roll (); - return TRUE; -} - void ARDOUR_UI::transport_stop () { @@ -2004,7 +1052,7 @@ ARDOUR_UI::transport_record () break; case Session::Recording: case Session::Enabled: - session->disable_record (); + session->disable_record (true); } } } @@ -2486,7 +1534,7 @@ ARDOUR_UI::snapshot_session () } void -ARDOUR_UI::save_state (string name) +ARDOUR_UI::save_state (const string & name) { (void) save_state_canfail (name); } @@ -2577,19 +1625,18 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff) switch (session->record_status()) { case Session::Enabled: if (onoff) { - rec_button.set_state (STATE_ACTIVE); + rec_button.set_state (1); } else { - rec_button.set_state (STATE_NORMAL); + rec_button.set_state (0); } break; case Session::Recording: - rec_button.set_state (STATE_ACTIVE); + rec_button.set_state (2); break; default: - rec_button.set_active (false); - rec_button.set_state (STATE_NORMAL); + rec_button.set_state (0); break; } } @@ -2719,7 +1766,7 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) } int -ARDOUR_UI::load_session (string path, string snap_name, string* mix_template) +ARDOUR_UI::load_session (const string & path, const string & snap_name, string* mix_template) { Session *new_session; int x; @@ -2771,7 +1818,7 @@ ARDOUR_UI::make_session_clean () } int -ARDOUR_UI::build_session (string path, string snap_name, +ARDOUR_UI::build_session (const string & path, const string & snap_name, uint32_t control_channels, uint32_t master_channels, Session::AutoConnectOption input_connect, @@ -2848,7 +1895,7 @@ ARDOUR_UI::hide_splash () } void -ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, string msg) +ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, const string & msg) { size_t removed;