diff --git a/packages/webamp-modern/assets/winamp_classic/scripts/display.m b/packages/webamp-modern/assets/winamp_classic/scripts/display.m new file mode 100644 index 00000000..f6288559 --- /dev/null +++ b/packages/webamp-modern/assets/winamp_classic/scripts/display.m @@ -0,0 +1,120 @@ +#include +#include "attribs.m" + +Global Group frameGroup; +Global Togglebutton ShuffleBtn,RepeatBtn,ShuffleBtn2,RepeatBtn2; +Global Timer SongTickerTimer; +Global Text InfoTicker; +Global GuiObject SongTicker; +Global Slider Balance; +Global Layout normal; + +function setSongtickerScrolling(); + +System.onScriptLoaded() { + initAttribs(); + frameGroup = getScriptGroup(); + SongTicker = frameGroup.findObject("songticker"); + InfoTicker = frameGroup.findObject("infoticker"); + normal = frameGroup.getParentLayout(); + + SongTickerTimer = new Timer; + SongTickerTimer.setDelay(1000); + + RepeatBtn = frameGroup.findObject("Repeat"); + ShuffleBtn = frameGroup.findObject("Shuffle"); + RepeatBtn2 = frameGroup.findObject("RepeatDisplay"); + ShuffleBtn2 = frameGroup.findObject("ShuffleDisplay"); + + Balance = frameGroup.findObject("Balance"); + setSongtickerScrolling(); +} + +normal.onAction (String action, String param, Int x, int y, int p1, int p2, GuiObject source) +{ + if (strlower(action) == "showinfo") + { + SongTicker.hide(); + SongTickerTimer.start(); + InfoTicker.setText(param); + InfoTicker.show(); + + } + else if (strlower(action) == "cancelinfo") + { + SongTickerTimer.onTimer (); + } +} + +SongTickerTimer.onTimer() { + SongTicker.show(); + InfoTicker.hide(); + SongTickerTimer.stop(); +} + +System.onScriptUnloading() { + delete SongTickerTimer; +} + +Balance.onSetPosition(int newpos) +{ + string t=translate("Balance")+":"; + if (newpos==127) t+= " " + translate("Center"); + if (newpos<127) t += " " + integerToString((100-(newpos/127)*100))+"% "+translate("Left"); + if (newpos>127) t += " " + integerToString(((newpos-127)/127)*100)+"% "+translate("Right"); + + SongTickerTimer.start(); + SongTicker.hide(); + InfoTicker.show(); + InfoTicker.setText(t); +} + +RepeatBtn.onToggle(boolean on) { + SongTickerTimer.start(); + int v = getCurCfgVal(); + SongTicker.hide(); + InfoTicker.show(); + if (v == 0) InfoTicker.setText("Repeat: OFF"); + else if (v > 0) InfoTicker.setText("Repeat: ALL"); + else if (v < 0) InfoTicker.setText("Repeat: TRACK"); +} + +ShuffleBtn.onToggle(boolean on) { + SongTickerTimer.start(); + SongTicker.hide(); + InfoTicker.show(); + if (on) InfoTicker.setText("Playlist Shuffling: ON"); else InfoTicker.setText("Playlist Shuffling: OFF"); +} + +RepeatBtn2.onToggle(boolean on) { + SongTickerTimer.start(); + int v = getCurCfgVal(); + SongTicker.hide(); + InfoTicker.show(); + if (v == 0) InfoTicker.setText("Repeat: OFF"); + else if (v > 0) InfoTicker.setText("Repeat: ALL"); + else if (v < 0) InfoTicker.setText("Repeat: TRACK"); +} + +ShuffleBtn2.onToggle(boolean on) { + SongTickerTimer.start(); + SongTicker.hide(); + InfoTicker.show(); + if (on) InfoTicker.setText("Playlist Shuffling: ON"); else InfoTicker.setText("Playlist Shuffling: OFF"); +} + +songticker_scrolling_attrib.onDataChanged() { + setSongtickerScrolling(); +} + +setSongtickerScrolling() { + if (songticker_scrolling_modern_attrib.getData()=="1") { + SongTicker.setXMLParam("ticker","bounce"); + } + else if (songticker_scrolling_classic_attrib.getData()=="1") { + SongTicker.setXMLParam("ticker","scroll"); + } + else { + SongTicker.setXMLParam("ticker","off"); + } +} \ No newline at end of file diff --git a/packages/webamp-modern/assets/winamp_classic/scripts/display.maki b/packages/webamp-modern/assets/winamp_classic/scripts/display.maki new file mode 100644 index 00000000..8a72ce32 Binary files /dev/null and b/packages/webamp-modern/assets/winamp_classic/scripts/display.maki differ diff --git a/packages/webamp-modern/assets/winamp_classic/scripts/eq.m b/packages/webamp-modern/assets/winamp_classic/scripts/eq.m new file mode 100644 index 00000000..64f4320d --- /dev/null +++ b/packages/webamp-modern/assets/winamp_classic/scripts/eq.m @@ -0,0 +1,90 @@ +#include +#include + +Global Group frameGroup, use; +Global Button btnEQp12,btnEQ0,btnEQm12; +Global Layer eqBand; +Global Boolean manual_set; + +Global Layout normal; + +#define ISOBANDS "31.5 Hz,63 Hz,125 Hz,250 Hz,500 Hz,1 KHz,2 KHz,4 KHz,8 KHz,16 KHz" +#define WINAMPBANDS "70 Hz,180 Hz,320 Hz,600 Hz,1 KHz,3 KHz,6 KHz,12 KHz,14 KHz,16 KHz" + +System.onScriptLoaded() { + WinampConfigGroup eqwcg = WinampConfig.getGroup("{72409F84-BAF1-4448-8211-D84A30A1591A}"); + int freqmode = eqwcg.getInt("frequencies"); // returns 0 for classical winamp levels, 1 for ISO levels + + frameGroup = getScriptGroup(); + normal = frameGroup.getParentLayout(); + btnEQp12 = frameGroup.findObject("EQ_p12"); + btnEQ0 = frameGroup.findObject("EQ_0"); + btnEQm12 = frameGroup.findObject("EQ_m12"); + eqBand = frameGroup.findObject("equalizer.band.label"); + + system.onEqFreqChanged(freqmode); +} + +btnEQp12.onLeftClick() { + manual_set = 1; + for(int i=0; i<10; i++) setEqBand(i, 127); + manual_set = 0; +} + +btnEQ0.onLeftClick() { + manual_set = 1; + for(int i=0; i<10; i++) setEqBand(i, 0); + manual_set = 0; +} + +btnEQm12.onLeftClick() { + manual_set = 1; + for(int i=0; i<10; i++) setEqBand(i, -127); + manual_set = 0; +} + +System.onEqFreqChanged (boolean isoonoff) +{ + if (isoonoff == 1) + { + eqBand.setXmlParam("image", "drawer.eq.label.iso"); + for(int i=0; i<10; i++) frameGroup.findObject("eq"+integerToString(i+1)).setXmlParam("tooltip", getToken(ISOBANDS,",",i)); + } + else + { + eqBand.setXmlParam("image", "drawer.eq.label.winamp"); + for(int i=0; i<10; i++) frameGroup.findObject("eq"+integerToString(i+1)).setXmlParam("tooltip", getToken(WINAMPBANDS,",",i)); + } +} + +system.onEqBandChanged(int band, int value) +{ + if (manual_set) return; + String t; + Float f = value; + f = f / 10.5; + WinampConfigGroup eqwcg = WinampConfig.getGroup("{72409F84-BAF1-4448-8211-D84A30A1591A}"); + if (eqwcg.getInt("frequencies") == 1) { + if (f >= 0) t = "EQ: " + translate(getToken(ISOBANDS,",",band)) + ": +" + floattostring(f, 1) + " "+ translate("dB"); + else t = "EQ: " + translate(getToken(ISOBANDS,",",band)) + ": " + floattostring(f, 1) + " "+ translate("dB"); + } + else { + if (f >= 0) t = "EQ: " + translate(getToken(WINAMPBANDS,",",band)) + ": +" + floattostring(f, 1) + " "+ translate("dB"); + else t = "EQ: " + translate(getToken(WINAMPBANDS,",",band)) + ": " + floattostring(f, 1) + " "+ translate("dB"); + } + + normal.sendAction("showinfo", t, 0,0,0,0); +} + +system.onEqPreampChanged(int value) +{ + slider s = getScriptGroup().findObject("preamp"); + value = s.getPosition(); // Somehow this function returns a range from [-127;125] with hotpos -3, so we take the slider instead + String t = "EQ: " + translate("Preamp:") + " "; + Float f = value; + f = f / 10.5; + if (f >= -3) t += "+"+floattostring(f, 1) + " "+ translate("dB"); + else t += floattostring(f, 1) + " "+ translate("dB"); + + normal.sendAction("showinfo", t, 0,0,0,0); +} \ No newline at end of file diff --git a/packages/webamp-modern/assets/winamp_classic/scripts/eq.maki b/packages/webamp-modern/assets/winamp_classic/scripts/eq.maki new file mode 100644 index 00000000..1437d7a4 Binary files /dev/null and b/packages/webamp-modern/assets/winamp_classic/scripts/eq.maki differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.BMP b/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.BMP deleted file mode 100644 index 8901bb46..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.bmp b/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.bmp deleted file mode 100644 index 8901bb46..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.BMP b/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.BMP deleted file mode 100644 index 72caf2dc..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.bmp deleted file mode 100644 index 72caf2dc..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQMAIN_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.BMP b/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.BMP deleted file mode 100644 index 42b4605e..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.bmp b/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.bmp deleted file mode 100644 index 42b4605e..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/EQ_EX.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/GEN.bmp b/packages/webamp-modern/assets/winamp_classic/skin/GEN.bmp deleted file mode 100644 index 92834d58..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/GEN.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/GENEX.BMP b/packages/webamp-modern/assets/winamp_classic/skin/GENEX.BMP deleted file mode 100644 index 13560213..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/GENEX.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/GENEX.bmp b/packages/webamp-modern/assets/winamp_classic/skin/GENEX.bmp deleted file mode 100644 index 13560213..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/GENEX.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.BMP b/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.BMP deleted file mode 100644 index 3e5df250..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.bmp b/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.bmp deleted file mode 100644 index 3e5df250..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/NUMBERS.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.BMP b/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.BMP deleted file mode 100644 index a252d950..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.bmp b/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.bmp deleted file mode 100644 index a252d950..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.BMP b/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.BMP deleted file mode 100644 index f30e354f..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.bmp deleted file mode 100644 index f30e354f..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/PLEDIT_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR3.bmp b/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR3.bmp deleted file mode 100644 index 842c7a0d..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR3.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.BMP b/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.BMP deleted file mode 100644 index 119f2b17..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.bmp deleted file mode 100644 index 119f2b17..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/TITLEBAR_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.BMP b/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.BMP deleted file mode 100644 index fc007ddc..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.bmp b/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.bmp deleted file mode 100644 index fc007ddc..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.BMP b/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.BMP deleted file mode 100644 index 15838eeb..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.BMP and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.bmp deleted file mode 100644 index 15838eeb..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/VIDEO_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/balance.bmp b/packages/webamp-modern/assets/winamp_classic/skin/balance.bmp deleted file mode 100644 index 3ce036e9..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/balance.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/cbuttons.bmp b/packages/webamp-modern/assets/winamp_classic/skin/cbuttons.bmp deleted file mode 100644 index 5abf0d4b..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/cbuttons.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso.bmp b/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso.bmp deleted file mode 100644 index 71db2e1a..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso_wacup.bmp deleted file mode 100644 index 2bf273f8..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/eqmain_iso_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/main.bmp b/packages/webamp-modern/assets/winamp_classic/skin/main.bmp deleted file mode 100644 index 9d8a58a4..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/main.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/main_wacup.bmp b/packages/webamp-modern/assets/winamp_classic/skin/main_wacup.bmp deleted file mode 100644 index ef0fc9f6..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/main_wacup.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/monoster.bmp b/packages/webamp-modern/assets/winamp_classic/skin/monoster.bmp deleted file mode 100644 index c9f500ab..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/monoster.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/numfont.png b/packages/webamp-modern/assets/winamp_classic/skin/numfont.png deleted file mode 100644 index da399a85..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/numfont.png and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/playPaus.bmp b/packages/webamp-modern/assets/winamp_classic/skin/playPaus.bmp deleted file mode 100644 index 3d697050..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/playPaus.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/posbar.bmp b/packages/webamp-modern/assets/winamp_classic/skin/posbar.bmp deleted file mode 100644 index be84d5c5..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/posbar.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/shufrep.bmp b/packages/webamp-modern/assets/winamp_classic/skin/shufrep.bmp deleted file mode 100644 index a1afdc10..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/shufrep.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/text.bmp b/packages/webamp-modern/assets/winamp_classic/skin/text.bmp deleted file mode 100644 index bc17f4c8..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/text.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/titlebar.bmp b/packages/webamp-modern/assets/winamp_classic/skin/titlebar.bmp deleted file mode 100644 index e156fe57..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/titlebar.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/volume.bmp b/packages/webamp-modern/assets/winamp_classic/skin/volume.bmp deleted file mode 100644 index deb7e924..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/volume.bmp and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/main_fallback.png b/packages/webamp-modern/assets/winamp_classic/skin/wasabi/main_fallback.png deleted file mode 100644 index f97becfa..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/main_fallback.png and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/objectframe.png b/packages/webamp-modern/assets/winamp_classic/skin/wasabi/objectframe.png deleted file mode 100644 index 36be5960..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/objectframe.png and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/shade_fallback.png b/packages/webamp-modern/assets/winamp_classic/skin/wasabi/shade_fallback.png deleted file mode 100644 index 9c12fde8..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/shade_fallback.png and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/window-elements.png b/packages/webamp-modern/assets/winamp_classic/skin/wasabi/window-elements.png deleted file mode 100644 index 8fe4b108..00000000 Binary files a/packages/webamp-modern/assets/winamp_classic/skin/wasabi/window-elements.png and /dev/null differ diff --git a/packages/webamp-modern/assets/winamp_classic/xml/player-normal2.xml b/packages/webamp-modern/assets/winamp_classic/xml/player-normal2.xml index 13653b29..16dceaf3 100644 --- a/packages/webamp-modern/assets/winamp_classic/xml/player-normal2.xml +++ b/packages/webamp-modern/assets/winamp_classic/xml/player-normal2.xml @@ -69,7 +69,7 @@ -