Binary files Mixer.app-1.8.0/Mixer.app and Mixer.app-1.8.0-frog2/Mixer.app differ diff -Nur Mixer.app-1.8.0/Mixer.cc Mixer.app-1.8.0-frog2/Mixer.cc --- Mixer.app-1.8.0/Mixer.cc Sun Sep 15 18:42:33 2002 +++ Mixer.app-1.8.0-frog2/Mixer.cc Sat Dec 13 16:03:17 2003 @@ -191,11 +191,11 @@ } if (mVolumeSource[1] == -1) { - mVolumeSource[1] = SOUND_MIXER_CD; + mVolumeSource[1] = SOUND_MIXER_PCM; } if (mVolumeSource[2] == -1) { - mVolumeSource[2] = SOUND_MIXER_PCM; + mVolumeSource[2] = SOUND_MIXER_LINE; } // Open display @@ -390,6 +390,22 @@ setVolume(1, mVolumePos[1]); setVolume(2, mVolumePos[2]); } + } else { + mVolumePos[0]=15; + mVolumePos[1]=15; + mVolumePos[2]=15; + setVolume(0, mVolumePos[0]); + setVolume(1, mVolumePos[1]); + setVolume(2, mVolumePos[2]); + char* home = getenv("HOME"); + if (home) { + mSettingsFile = new char[strlen(home) + strlen(SETTINGS) + 1]; + strcpy(mSettingsFile, home); + strcat(mSettingsFile, SETTINGS); + saveVolumeSettings(); + } else { + cerr << APPNAME << ": $HOME not set, could not find saved settings" << endl; + } } } @@ -561,7 +577,20 @@ case ButtonPress: if (event.xbutton.button == Button4 || event.xbutton.button == Button5) { // Wheel scroll - setButtonPosition(mWheelButton - 1, event.xbutton.button == Button5? 3: -3); + if((mButton[0]==event.xbutton.window)||(mButton[1]==event.xbutton.window)||(mButton[2]==event.xbutton.window)) { + for (int i=0; i<3; i++) { + if (mButton[i] == event.xbutton.window) { + setButtonPosition(i, event.xbutton.button == Button5? 3: -3); + break; + } + } + } else if(event.xbutton.x < 24 || event.xbutton.window == mButton[0]) { + setButtonPosition(0, event.xbutton.button == Button5? 3: -3); + } else if(event.xbutton.x > 42 || event.xbutton.window == mButton[2]) { + setButtonPosition(2, event.xbutton.button == Button5? 3: -3); + } else { + setButtonPosition(1, event.xbutton.button == Button5? 3: -3); + } } else if (event.xbutton.button == Button1 && event.xbutton.window != mIconWin) { // Volume change buttonDown = 1; diff -Nur Mixer.app-1.8.0/skins/frog/button.xpm Mixer.app-1.8.0-frog2/skins/frog/button.xpm --- Mixer.app-1.8.0/skins/frog/button.xpm Thu Jan 1 01:00:00 1970 +++ Mixer.app-1.8.0-frog2/skins/frog/button.xpm Sat Dec 13 12:56:51 2003 @@ -0,0 +1,29 @@ +/* XPM */ +static char * button_xpm[] = { +"16 9 17 1", +" c None", +". c #B7BAC7", +"+ c #848694", +"@ c #838593", +"# c #828392", +"$ c #808290", +"% c #7F818F", +"& c #7E808E", +"* c #7C7E8C", +"= c #7B7D8B", +"- c #7A7C8A", +"; c #787A88", +"> c #777987", +", c #767886", +"' c #747784", +") c #737583", +"! c #000000", +"................", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".!!!!!!!!!!!!!!!"}; diff -Nur Mixer.app-1.8.0/skins/frog/main.xpm Mixer.app-1.8.0-frog2/skins/frog/main.xpm --- Mixer.app-1.8.0/skins/frog/main.xpm Thu Jan 1 01:00:00 1970 +++ Mixer.app-1.8.0-frog2/skins/frog/main.xpm Sat Dec 13 12:56:51 2003 @@ -0,0 +1,261 @@ +/* XPM */ +static char * main_xpm[] = { +"64 64 194 2", +" c None", +". c #000000", +"+ c #2F2542", +"@ c #302643", +"# c #322745", +"$ c #332846", +"% c #342948", +"& c #352A49", +"* c #362B4B", +"= c #372C4C", +"- c #382D4E", +"; c #392E4F", +"> c #3A2E50", +", c #3B2F52", +"' c #3C3053", +") c #3C3154", +"! c #3D3155", +"~ c #3E3256", +"{ c #3F3357", +"] c #3F3358", +"^ c #403459", +"/ c #41345A", +"( c #41355A", +"_ c #41355B", +": c #42355B", +"< c #42365C", +"[ c #43365D", +"} c #B7BAC7", +"| c #312745", +"1 c #352A4A", +"2 c #372C4D", +"3 c #392F50", +"4 c #3B3052", +"5 c #43365C", +"6 c #43375E", +"7 c #44375E", +"8 c #44375F", +"9 c #44385F", +"0 c #45385F", +"a c #3A2F51", +"b c #322846", +"c c #392E50", +"d c #3A2F52", +"e c #453860", +"f c #463961", +"g c #3C3054", +"h c #3B3053", +"i c #332948", +"j c #403358", +"k c #463962", +"l c #473A62", +"m c #473A63", +"n c #483A63", +"o c #473963", +"p c #483A64", +"q c #3D3154", +"r c #332947", +"s c #342A49", +"t c #2E2F40", +"u c #9F9FB1", +"v c #483B64", +"w c #493B65", +"x c #493C65", +"y c #493C66", +"z c #303143", +"A c #A1A1B3", +"B c #2F2F40", +"C c #352B4A", +"D c #483B65", +"E c #4A3C66", +"F c #4A3C67", +"G c #4A3D67", +"H c #4B3D67", +"I c #4B3D68", +"J c #313143", +"K c #A1A1B4", +"L c #2F3041", +"M c #362B4C", +"N c #382D4D", +"O c #43375D", +"P c #4B3E69", +"Q c #4C3E69", +"R c #4C3E6A", +"S c #313244", +"T c #A2A1B4", +"U c #4C3F6A", +"V c #392D4F", +"W c #A0A0B2", +"X c #453960", +"Y c #4D3F6A", +"Z c #4D3F6B", +"` c #4E406C", +" . c #A2A2B5", +".. c #4F406D", +"+. c #4F416D", +"@. c #4F416E", +"#. c #323245", +"$. c #50416E", +"%. c #303042", +"&. c #382C4D", +"*. c #4D3F6C", +"=. c #4E406D", +"-. c #50426F", +";. c #504270", +">. c #514270", +",. c #A3A2B6", +"'. c #514371", +"). c #2F3042", +"!. c #524371", +"~. c #524372", +"{. c #524472", +"]. c #534473", +"^. c #323345", +"/. c #303142", +"(. c #A0A0B3", +"_. c #534574", +":. c #544574", +"<. c #544575", +"[. c #333346", +"}. c #A3A3B6", +"|. c #A1A0B3", +"1. c #554676", +"2. c #564777", +"3. c #A3A3B7", +"4. c #50416F", +"5. c #554675", +"6. c #574778", +"7. c #574879", +"8. c #333347", +"9. c #A4A3B7", +"0. c #58497A", +"a. c #58497B", +"b. c #59497B", +"c. c #343447", +"d. c #A4A3B8", +"e. c #3E3257", +"f. c #564778", +"g. c #594A7C", +"h. c #5A4A7D", +"i. c #5A4B7D", +"j. c #343448", +"k. c #A4A4B8", +"l. c #5B4B7E", +"m. c #313144", +"n. c #5C4C7F", +"o. c #A5A4B9", +"p. c #5C4C80", +"q. c #5A4A7C", +"r. c #5D4D81", +"s. c #5D4D82", +"t. c #353448", +"u. c #5E4D82", +"v. c #5E4E83", +"w. c #5F4F84", +"x. c #353549", +"y. c #A5A5B9", +"z. c #5E4E82", +"A. c #604F85", +"B. c #615086", +"C. c #A6A5BA", +"D. c #605086", +"E. c #615187", +"F. c #625188", +"G. c #35354A", +"H. c #625288", +"I. c #323244", +"J. c #625187", +"K. c #635289", +"L. c #63528A", +"M. c #36364A", +"N. c #A6A5BB", +"O. c #64538B", +"P. c #64538A", +"Q. c #65548C", +"R. c #36364B", +"S. c #A7A6BB", +"T. c #66548D", +"U. c #66558D", +"V. c #A7A6BC", +"W. c #67558F", +"X. c #685790", +"Y. c #584879", +"Z. c #59497C", +"`. c #67568F", +" + c #37364B", +".+ c #A8A6BD", +"++ c #695791", +"@+ c #2E2F3F", +"#+ c #9F9FB0", +"$+ c #382E4E", +"%+ c #42355C", +"&+ c #2E2440", +"*+ c #292039", +"=+ c #00FF29", +" ", +" ", +" ", +" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < < [ [ [ [ [ [ [ < < : _ ( / ^ ] { ~ ! ) ' , > ; - = * & % $ # @ } ", +" . @ | $ % 1 * 2 - ; 3 4 ' ! ~ { ] ^ / _ < 5 [ 6 7 7 8 9 7 0 0 9 8 7 7 6 [ 5 < _ / ^ ] { ~ ! , 4 a ; - 2 * 1 % $ | } ", +" . | b % & * 2 - c a d ) ! ~ ] ^ / : < [ 6 7 0 e e f f f e f f f f f e e 0 7 6 [ < : / ^ ] ~ g ) h a c - 2 * & % b } ", +" . b i & * 2 - c a ' ' ~ { j ^ _ < [ 7 9 e f f k l m m n o p p n m m l k f f e 9 7 [ < _ ^ j ~ ~ q ' a c - 2 * & i } ", +" . r s * = - c a ' q t u ^ / : [ 6 8 e f k m n v v w x y z A y y x w v v n m k f e 8 6 [ : / B u ~ q ' a c - = * s } ", +" . s C = - ; a ' q ~ t u ( < [ 7 e f k m v D x E F G H I J K I I H G F E x D v m k f e 7 [ < L u { ~ q ' a ; - = C } ", +" . 1 M N ; a h q ~ { B u < O 8 e f m v w y F H I P Q R R S T U R R Q P I H F y w v m f e 8 O L u ^ { ~ q h a ; N M } ", +" . * 2 V > 4 ) ~ { ^ L W 6 9 X k m v y F I P Q Y Z Z ` ` S .` ` ` Z Z Y Q P I F y v m k X 9 L W ( ^ { ~ ) 4 > V 2 } ", +" . = - c , ' ! { ^ ( L W 0 f l p w E H P R Z Z ` ..+.@.@.#. .$.@.@.+...` Z Z R P H E w p l f %.W < ( ^ { ! ' , c - } ", +" . &.; a ' ! ~ j / < L W f l v w F I Q Y *.=.+.$.-.;.>.>.#.,.'.>.>.;.-.$.+.=.*.Y Q I F w v l %.W O < / j ~ ! ' a ; } ", +" . - > 4 ) ~ ] ^ : [ ).W l v x G I R Z ` +.$.-.>.!.~.{.].^.,.].].{.~.!.>.-.$.+.` Z R I G x v /.W 8 [ : ^ ] ~ ) 4 > } ", +" . ; a ' ! { ^ _ [ 7 %.(.p w G I R Z =.@.-.>.!.{.]._.:.<.[.}.<.<.:._.].{.!.>.-.@.=.Z R I G w z (.e 7 [ _ ^ { ! ' a } ", +" . > 4 q ~ ] / < 6 e %.|.w F I R Z ..$.>.!.{.].:.<.1.1.2.[.3.2.2.1.1.<.:.].{.!.>.$...Z R I F z |.f e 6 < / ] ~ q 4 } ", +" . a ' ! { ^ : [ 8 f /.A E I R Z ..4.>.!.].:.5.1.2.6.7.7.8.9.7.7.7.6.2.1.5.:.].!.>.4...Z R I J A m f 8 [ : ^ { ! ' } ", +" . , ) ~ ] / < 7 e k z A H Q Z =.$.>.~.].<.1.2.6.7.0.a.b.c.d.b.b.a.0.7.6.2.1.<.].~.>.$.=.Z Q J A v k e 7 < / ] ~ ) } ", +" . ' ! e.^ _ [ 9 f m z K P Y ` @.>.!.].<.1.f.7.0.b.g.h.i.j.k.l.i.h.g.b.0.7.f.1.<.].!.>.@.` Y m.K w m f 9 [ _ ^ e.! } ", +" . ' ~ ] / < 6 e k v z K R *.+.-.!.].<.1.f.7.a.g.h.l.n.n.j.o.p.n.n.l.h.g.a.7.f.1.<.].!.-.+.*.m.K y v k e 6 < / ] ~ } ", +" . ) ~ j ( 5 7 f m D J K Z =.$.>.{.:.1.f.7.b.q.l.n.p.r.s.t.o.u.s.r.p.n.l.q.b.7.f.1.:.{.>.$.=.S K F D m f 7 5 ( j ~ } ", +" . ! e.^ _ [ 0 f n x J T Z +.-.!.].5.2.7.a.q.l.n.r.u.v.w.x.y.w.w.v.u.r.n.l.q.a.7.2.5.].!.-.+.S T H x n f 0 [ _ ^ e.} ", +" . ! { ^ : 6 e k v E J T ` $.>.{.:.1.6.0.g.l.n.r.z.w.A.B.x.C.B.B.A.w.z.r.n.l.g.0.6.1.:.{.>.$.S T I E v k e 6 : ^ { } ", +" . ~ ] / < 7 e l v F m.T ..-.!.].<.2.7.b.h.n.r.z.w.D.E.F.G.C.H.F.E.D.w.z.r.n.h.b.7.2.<.].!.-.I.T P F v l e 7 < / ] } ", +" . ~ ] ( < 7 f m w G m.T +.;.~._.1.6.0.g.l.p.u.w.D.J.K.L.M.N.O.L.K.J.D.w.u.p.l.g.0.6.1._.~.;.I.T Q G w m f 7 < ( ] } ", +" . ~ j ( [ 8 f m x H m. .@.>.{.:.1.7.a.h.n.r.v.A.E.K.P.Q.R.S.T.Q.P.K.E.A.v.r.n.h.a.7.1.:.{.>.#. .R H x m f 8 [ ( j } ", +" . ~ ^ _ [ 9 f n y I m. .@.>.].<.2.7.b.i.n.s.w.B.F.L.Q.U.R.V.W.U.Q.L.F.B.w.s.n.i.b.7.2.<.].>.#. .R I y n f 9 [ _ ^ } ", +" . ~ ^ _ [ 0 f p y I S .$.'.].<.2.7.b.l.p.u.w.B.H.O.T.W.R.V.X.W.T.O.H.B.w.u.p.l.b.7.2.<.].'.#. .U I y p f 0 [ _ ^ } ", +" . e.^ _ [ 0 f p y I S .$.'.].<.2.Y.Z.l.p.z.w.B.K.O.T.`. +.+++`.T.O.K.B.w.z.p.l.Z.Y.2.<.].'.#. .U I y p f 0 [ _ ^ } ", +" . ~ ^ _ [ 0 f p y I S .$.'.].<.2.7.b.l.p.u.w.B.H.O.T.W.R.V.X.W.T.O.H.B.w.u.p.l.b.7.2.<.].'.#. .U I y p f 0 [ _ ^ } ", +" . ~ ^ _ [ 9 f n y I m. .@.>.].<.2.7.b.i.n.s.w.B.F.L.Q.U.R.V.W.U.Q.L.F.B.w.s.n.i.b.7.2.<.].>.#. .R I y n f 9 [ _ ^ } ", +" . ~ j ( [ 8 f m x H m. .@.>.{.:.1.7.a.h.n.r.v.A.E.K.P.Q.R.S.T.Q.P.K.E.A.v.r.n.h.a.7.1.:.{.>.#. .R H x m f 8 [ ( j } ", +" . ~ ] ( < 7 f m w G m.T +.;.~._.1.6.0.g.l.p.u.w.D.J.K.L.M.N.O.L.K.J.D.w.u.p.l.g.0.6.1._.~.;.I.T Q G w m f 7 < ( ] } ", +" . ~ ] / < 7 e l v F m.T ..-.!.].<.2.7.b.h.n.r.z.w.D.E.F.G.C.H.F.E.D.w.z.r.n.h.b.7.2.<.].!.-.I.T P F v l e 7 < / ] } ", +" . ! { ^ : 6 e k v E J T ` $.>.{.:.1.6.0.g.l.n.r.z.w.A.B.x.C.B.B.A.w.z.r.n.l.g.0.6.1.:.{.>.$.S T I E v k e 6 : ^ { } ", +" . ! e.^ _ [ 0 f n x J T Z +.-.!.].5.2.7.a.q.l.n.r.u.v.w.x.y.w.w.v.u.r.n.l.q.a.7.2.5.].!.-.+.S T H x n f 0 [ _ ^ e.} ", +" . ) ~ j ( 5 7 f m D J K Z =.$.>.{.:.1.f.7.b.q.l.n.p.r.s.t.o.u.s.r.p.n.l.q.b.7.f.1.:.{.>.$.=.S K F D m f 7 5 ( j ~ } ", +" . ' ~ ] / < 6 e k v z K R *.+.-.!.].<.1.f.7.a.g.h.l.n.n.j.o.p.n.n.l.h.g.a.7.f.1.<.].!.-.+.*.m.K y v k e 6 < / ] ~ } ", +" . ' ! e.^ _ [ 9 f m z K P Y ` @.>.!.].<.1.f.7.0.b.g.h.i.j.k.l.i.h.g.b.0.7.f.1.<.].!.>.@.` Y m.K w m f 9 [ _ ^ e.! } ", +" . , ) ~ ] / < 7 e k z A H Q Z =.$.>.~.].<.1.2.6.7.0.a.b.c.d.b.b.a.0.7.6.2.1.<.].~.>.$.=.Z Q J A v k e 7 < / ] ~ ) } ", +" . a ' ! { ^ : [ 8 f /.A E I R Z ..4.>.!.].:.5.1.2.6.7.7.8.9.7.7.7.6.2.1.5.:.].!.>.4...Z R I J A m f 8 [ : ^ { ! ' } ", +" . > 4 q ~ ] / < 6 e %.|.w F I R Z ..$.>.!.{.].:.<.1.1.2.[.3.2.2.1.1.<.:.].{.!.>.$...Z R I F z |.f e 6 < / ] ~ q 4 } ", +" . ; a ' ! { ^ _ [ 7 %.(.p w G I R Z =.@.-.>.!.{.]._.:.<.[.}.<.<.:._.].{.!.>.-.@.=.Z R I G w z (.e 7 [ _ ^ { ! ' a } ", +" . - > 4 ) ~ ] ^ : [ ).W l v x G I R Z ` +.$.-.>.!.~.{.].^.,.].].{.~.!.>.-.$.+.` Z R I G x v /.W 8 [ : ^ ] ~ ) 4 > } ", +" . &.; a ' ! ~ j / < L W f l v w F I Q Y *.=.+.$.-.;.>.>.#.,.'.>.>.;.-.$.+.=.*.Y Q I F w v l %.W O < / j ~ ! ' a ; } ", +" . = - c , ' ! { ^ ( L W 0 f l p w E H P R Z Z ` ..+.@.@.#. .$.@.@.+...` Z Z R P H E w p l f %.W < ( ^ { ! ' , c - } ", +" . * 2 V > 4 ) ~ { ^ L W 6 9 X k m v y F I P Q Y Z Z ` ` S .` ` ` Z Z Y Q P I F y v m k X 9 L W ( ^ { ~ ) 4 > V 2 } ", +" . 1 M N ; a h q ~ { B u < O 8 e f m v w y F H I P Q R R S T U R R Q P I H F y w v m f e 8 O L u ^ { ~ q h a ; N M } ", +" . s C = - ; a ' q ~ t u ( < [ 7 e f k m v D x E F G H I J K I I H G F E x D v m k f e 7 [ < L u { ~ q ' a ; - = C } ", +" . r s * = - c a ' q t u ^ / : [ 6 8 e f k m n v v w x y z A y y x w v v n m k f e 8 6 [ : / B u ~ q ' a c - = * s } ", +" . b i & * 2 - c a ' @+#+{ j ^ _ < [ 7 9 e f f k l m m n z |.p n m m l k f f e 9 7 [ < _ ^ j t #+q ' a c - 2 * & i } ", +" . | b % & * 2 - c a d ) ! ~ ] ^ / : < [ 6 7 0 e e f f f e f f f f f e e 0 7 6 [ < : / ^ ] ~ g ) h a c - 2 * & % b } ", +" . @ | $ % 1 * 2 - ; 3 4 ' ! ~ { ] ^ / _ < 5 [ 6 7 7 8 9 7 0 0 9 8 7 7 6 [ 5 < _ / ^ ] { ~ ! , 4 a ; - 2 * 1 % $ | } ", +" . + @ # $ % & * = - $+> , ' ) ! ~ { ] ^ / ( _ : < < [ [ %+[ [ [ [ < < : _ ( / ^ ] { ~ ! ) ' a > ; - = * & % $ # @ } ", +" . &++ @ # $ % & * = N V c a 4 ' q ! ~ e.] j ^ ^ / ( ( _ _ _ _ _ ( ( / ^ ^ j ] e.~ ! q ' 4 a c V N = * & % $ # @ + } ", +" . } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } ", +" *+ *+ *+ *+ *+ *+*+*+ *+*+*+ ", +" *+*+ *+*+ *+ *+ *+ *+ *+ *+ *+*+*+*+ ", +" *+ *+ *+ *+ *+*+ *+*+*+ *+*+*+ *+=+=+=+ ", +" *+ *+ *+ *+ *+ *+ *+ *+ *+=+=+=+ ", +" *+ *+ *+ *+ *+ *+*+*+ *+ *+ ", +" ", +" "}; diff -Nur Mixer.app-1.8.0/skins/frog/mutebutton.xpm Mixer.app-1.8.0-frog2/skins/frog/mutebutton.xpm --- Mixer.app-1.8.0/skins/frog/mutebutton.xpm Thu Jan 1 01:00:00 1970 +++ Mixer.app-1.8.0-frog2/skins/frog/mutebutton.xpm Sat Dec 13 12:56:51 2003 @@ -0,0 +1,30 @@ +/* XPM */ +static char * mutebutton_xpm[] = { +"16 9 18 1", +" c None", +". c #B7BAC7", +"+ c #848694", +"@ c #838593", +"# c #828392", +"$ c #808290", +"% c #7F818F", +"& c #7E808E", +"* c #7C7E8C", +"= c #7B7D8B", +"- c #7A7C8A", +"; c #787A88", +"> c #777987", +", c #767886", +"' c #747784", +") c #737583", +"! c #000000", +"~ c #FF0000", +"................", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,')!", +".+@#$%&*=-;>,'~!", +".+@#$%&*=-;>,~~!", +".+@#$%&*=-;>~~~!", +".!!!!!!!!!!!!!!!"}; diff -Nur Mixer.app-1.8.0/skins/frog/redlight.xpm Mixer.app-1.8.0-frog2/skins/frog/redlight.xpm --- Mixer.app-1.8.0/skins/frog/redlight.xpm Thu Jan 1 01:00:00 1970 +++ Mixer.app-1.8.0-frog2/skins/frog/redlight.xpm Sat Dec 13 12:56:51 2003 @@ -0,0 +1,7 @@ +/* XPM */ +static char * redlight_xpm[] = { +"3 2 2 1", +" c None", +". c #FF0000", +"...", +"..."};