From ba740eb17ca8d1fe60afea89fe4a734ea168aba1 Mon Sep 17 00:00:00 2001 From: Peyu Yovev Date: Wed, 27 Dec 2017 08:36:03 +0200 Subject: [PATCH] BgRadio@spacy01: Update and changes (#1573) * Bgradio@spacy01: Update README.md Add change log, and update description. * BgRadio@spacy01: Update pot file Add new strings and update description. * BgRadio@spacy01: Update bg.po New strings and change metadata description. * BgRadio@spacy01: Update applet.js - New tv stream. - Fix broken tv streams. - Replace vlc player with mpv. - Add check for needed packages. * BgRadio@spacy01: mpv config folder and files This allows on users to use different player configuration, when using the applet. The main player configuration will stay intact. Create input.conf file to disable or change some keys, who can broke the live stream. * BgRadio@spacy01: Create mpv config mpv onfig file to disable on screen controls for better experience. * BgRadio@spacy01: Update description Update description, add a new player dependency. --- BgRadio@spacy01/README.md | 27 ++-- .../files/BgRadio@spacy01/applet.js | 139 ++++++++++-------- .../files/BgRadio@spacy01/metadata.json | 2 +- .../files/BgRadio@spacy01/mpv/input.conf | 17 +++ .../files/BgRadio@spacy01/mpv/mpv.conf | 1 + .../BgRadio@spacy01/po/BgRadio@spacy01.pot | 10 +- .../files/BgRadio@spacy01/po/bg.po | 12 +- 7 files changed, 126 insertions(+), 82 deletions(-) create mode 100644 BgRadio@spacy01/files/BgRadio@spacy01/mpv/input.conf create mode 100644 BgRadio@spacy01/files/BgRadio@spacy01/mpv/mpv.conf diff --git a/BgRadio@spacy01/README.md b/BgRadio@spacy01/README.md index e1589c161ed..20f0ec87aec 100644 --- a/BgRadio@spacy01/README.md +++ b/BgRadio@spacy01/README.md @@ -1,13 +1,14 @@ -Applet for streaming some of the most famous bulgarian radio and tv streams. This applet is completely rewritten previous applet BgRadio@spacy01. - -Changes: - - - moc player is replaced with vlc player - - it's been added some tv streams - - radio streams have been updated - - more compact menu - - updated localization - - new icons - -In order to make tv strems to work, you'll need to install rtmpdump. -Some of the streams are avaivable only from Bulgaria. + + +Applet for streaming some of the most famous bulgarian radio and tv streams. + +Changes 23.12.2017: + + - vlc player is replaced with mpv + - radio and tv streams was updated + - Add new tv and radio streams + - Some tv streams was fixed + - mpv and rtmpdump packages check + - Updated localization + +In order to make tv and radio streams to work, you'll need to install rtmpdump and mpv. Some of the streams are avaivable only from Bulgaria. diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/applet.js b/BgRadio@spacy01/files/BgRadio@spacy01/applet.js index d626e6b5234..fe8f7299683 100755 --- a/BgRadio@spacy01/files/BgRadio@spacy01/applet.js +++ b/BgRadio@spacy01/files/BgRadio@spacy01/applet.js @@ -23,7 +23,7 @@ function ConfirmDialog(){ function MyApplet(orientation) { this._init(orientation); } - + MyApplet.prototype = { __proto__: Applet.IconApplet.prototype, @@ -39,134 +39,134 @@ MyApplet.prototype = { this.menuManager.addMenu(this.menu); this._contentSection = new PopupMenu.PopupMenuSection(); - this.menu.addMenuItem(this._contentSection); + this.menu.addMenuItem(this._contentSection); //radio - dropdown menu this.RadioItem = new PopupMenu.PopupSubMenuMenuItem(_("Radio")); //bg radio this.RadioItem.menu.addAction(_("Bg Radio"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://149.13.0.81:80/bgradio.ogg &"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://149.13.0.81:80/bgradio.ogg &"); Main.notify(_("Listening Bg Radio")); }); //btv radio this.RadioItem.menu.addAction(_("bTV Radio"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://live.btvradio.bg/btv-radio.mp3 &"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://live.btvradio.bg/btv-radio.mp3 &"); Main.notify(_("Listening bTV Radio")); }); //city radio this.RadioItem.menu.addAction(_("City Radio"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://149.13.0.81:8000/city.ogg"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://149.13.0.81:8000/city.ogg"); Main.notify(_("Listening City Radio")); }); //classicfm radio this.RadioItem.menu.addAction(_("Classic FM"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://live.btvradio.bg/classic-fm.mp3"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://live.btvradio.bg/classic-fm.mp3"); Main.notify(_("Listening Classic FM")); }); //darik radio this.RadioItem.menu.addAction(_("Darik"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://darikradio.by.host.bg:8000/S2-128"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://darikradio.by.host.bg:8000/S2-128"); Main.notify(_("Listening Darik")); }); - + //darik nostalgie this.RadioItem.menu.addAction(_("Darik Nostalgie"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://darikradio.by.host.bg:8000/Nostalgie"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://darikradio.by.host.bg:8000/Nostalgie"); Main.notify(_("Listening Darik Nostalgie")); }); //energy radio this.RadioItem.menu.addAction(_("Energy"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://149.13.0.80/nrj_low.ogg &"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://149.13.0.80/nrj_low.ogg &"); Main.notify(_("Listening Energy")); }); //fmplus radio this.RadioItem.menu.addAction(_("FM+"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://193.108.24.21:8000/fmplus"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://193.108.24.21:8000/fmplus"); Main.notify(_("Listening FM+")); }); //fresh radio this.RadioItem.menu.addAction(_("Fresh"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://193.108.24.21:8000/fresh"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://193.108.24.21:8000/fresh"); Main.notify(_("Listening Fresh")); }); //jazzfm radio this.RadioItem.menu.addAction(_("Jazz FM"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://live.btvradio.bg/jazz-fm.mp3"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://live.btvradio.bg/jazz-fm.mp3"); Main.notify(_("Listening Jazz FM")); }); //k2 radio this.RadioItem.menu.addAction(_("K2"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://stream.radiok2.bg:8000/rk2-high"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://stream.radiok2.bg:8000/rk2-high"); Main.notify(_("Listening K2")); }); //melody radio this.RadioItem.menu.addAction(_("Melody"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://193.108.24.6:8000/melody"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://193.108.24.6:8000/melody"); Main.notify(_("Listening Melody")); }); //njoy radio this.RadioItem.menu.addAction(_("N-Joy"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://live.btvradio.bg/njoy.mp3"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://live.btvradio.bg/njoy.mp3"); Main.notify(_("Listening N-Joy")); }); //nova radio this.RadioItem.menu.addAction(_("Nova Radio"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://stream81.metacast.eu/nova.ogg"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://stream81.metacast.eu/nova.ogg"); Main.notify(_("Listening Nova Radio")); }); //radio1 radio this.RadioItem.menu.addAction(_("Radio 1"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://149.13.0.81/radio1.ogg"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://149.13.0.81/radio1.ogg"); Main.notify(_("Listening Radio 1")); }); //radio1rock radio this.RadioItem.menu.addAction(_("Radio 1 Rock"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://149.13.0.81/radio1rock.ogg"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://149.13.0.81/radio1rock.ogg"); Main.notify(_("Listening Radio 1 Rock")); }); //thevoice radio this.RadioItem.menu.addAction(_("The Voice Radio"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc rtsp://31.13.217.76:1935/rtplive/thevoiceradio_live.stream"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv rtsp://31.13.217.76:1935/rtplive/thevoiceradio_live.stream"); Main.notify(_("Listening The Voice Radio")); }); //zrock radio this.RadioItem.menu.addAction(_("Z-Rock"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("cvlc http://live.btvradio.bg/z-rock.mp3"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("mpv http://live.btvradio.bg/z-rock.mp3"); Main.notify(_("Listening Z-Rock")); }); @@ -179,89 +179,96 @@ MyApplet.prototype = { //bnt this.TvItem.menu.addAction(_("BNT"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'http://ios.cdn.bg:2020/fls' -a 'fls' -f 'WIN 11,5,502,149' -p 'http://cdn.bg/live/8W5GA2ujvB' -W 'http://cdn.bg/eflash/jwplayer510/player.swf' -y 'bnt.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' -b '0' | vlc --meta-title 'BNT' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"wget -r -l1 -H -Dcdn.bg -O '/tmp/bnt.txt' 'http://tv.bnt.bg/bnt1/16x9/'; grep playlist.m3u8 '/tmp/bnt.txt' | cut -c27-115 > '/tmp/bnt1.txt'; mpv --title=BNT --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv $(cat /tmp/bnt1.txt); rm /tmp/bnt.txt /tmp/bnt1.txt \""); Main.notify(_("Watching BNT")); }); //bnt2 this.TvItem.menu.addAction(_("BNT 2"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'http://ios.cdn.bg:2020/fls' -a 'fls' -f 'WIN 11,5,502,149' -p 'http://cdn.bg/live/fkL0GWOoP6' -W 'http://cdn.bg/eflash/jwplayer510/player.swf' -y 'bnt2.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' -b '0' - | vlc --meta-title 'BNT 2' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"wget -r -l1 -H -Dcdn.bg -O '/tmp/bnt.txt' 'http://tv.bnt.bg/bnt2/16x9/'; grep playlist.m3u8 '/tmp/bnt.txt' | cut -c27-115 > '/tmp/bnt1.txt'; mpv --title='BNT 2' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv $(cat /tmp/bnt1.txt); rm /tmp/bnt.txt /tmp/bnt1.txt\""); Main.notify(_("Watching BNT 2")); }); //bnthd this.TvItem.menu.addAction(_("BNT HD"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'http://ios.cdn.bg:2020/fls' -a 'fls' -f 'WIN 11,5,502,149' -p 'http://cdn.bg/live/fkL0GWOoP6' -W 'http://cdn.bg/eflash/jwplayer510/player.swf' -y 'bntHDt.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' -b '0' - | vlc --meta-title 'BNT HD' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"wget -r -l1 -H -Dcdn.bg -O '/tmp/bnt.txt' 'http://tv.bnt.bg/bnthd/'; grep playlist.m3u8 '/tmp/bnt.txt' | cut -c27-116 > '/tmp/bnt1.txt'; mpv --title='BNT HD' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv $(cat /tmp/bnt1.txt); rm /tmp/bnt.txt /tmp/bnt1.txt\""); Main.notify(_("Watching BNT HD")); }); //bntsat this.TvItem.menu.addAction(_("BNT World"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://edge11.cdn.bg:2020/fls' -a 'fls/' -p 'http://i.cdn.bg/live/ls4wHAbTmY' -y 'bntW.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' -b '0' - | vlc --meta-title 'BNT World' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"wget -r -l1 -H -Dcdn.bg -O '/tmp/bnt.txt' 'http://tv.bnt.bg/bntworld/'; grep playlist.m3u8 '/tmp/bnt.txt' | cut -c27-115 > '/tmp/bnt1.txt'; mpv --title='BNT World' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv $(cat /tmp/bnt1.txt); rm /tmp/bnt.txt /tmp/bnt1.txt\""); Main.notify(_("Watching BNT World")); }); //btv this.TvItem.menu.addAction(_("bTV"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("vlc 'http://46.10.150.111/alpha/alpha/playlist.m3u8' --meta-title 'bTV'"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"mpv 'http://46.10.150.111/alpha/alpha/playlist.m3u8' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='bTV'\""); Main.notify(_("Watching bTV")); }); //bit this.TvItem.menu.addAction(_("BIT"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("vlc 'http://hls.cdn.bg:2103/fls/bit_2.stream/playlist.m3u8' --meta-title 'BIT'"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"mpv 'http://hls.cdn.bg:2103/fls/bit_2.stream/playlist.m3u8' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='BIT'\""); Main.notify(_("Watching BIT")); }); //city this.TvItem.menu.addAction(_("City"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://nodeb.gocaster.net:1935/CGL/_definst_/' -W 'http://iphone.fmstreams.com/jwplayer/player.swf' -p 'http://city.bg/live/' -y 'mp4:TODAYFM_TEST2' -b '0' | vlc --meta-title 'City' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://nodeb.gocaster.net:1935/CGL/_definst_/' -W 'http://iphone.fmstreams.com/jwplayer/player.swf' -p 'http://city.bg/live/' -y 'mp4:TODAYFM_TEST2' -b '0' | mpv --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='City' -\""); Main.notify(_("Watching City")); }); //kanal3 this.TvItem.menu.addAction(_("Kanal 3"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://edge4.cdn.bg:2017/fls' -a 'fls/' -W 'http://i.cdn.bg/flash/jwplayer510/player.swf' -f 'WIN 18,0,0,232' -p 'http://i.cdn.bg/live/Atki7GnEae' -y 'kanal3.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' | vlc --meta-title 'Kanal 3' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://edge4.cdn.bg:2017/fls' -a 'fls/' -W 'http://i.cdn.bg/flash/jwplayer510/player.swf' -f 'WIN 18,0,0,232' -p 'http://i.cdn.bg/live/Atki7GnEae' -y 'kanal3.stream?at=b0d1270b39e08ad9c78dc53f43a1ba5c' | mpv --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='Kanal 3' -\""); Main.notify(_("Watching Kanal 3")); }); //nova this.TvItem.menu.addAction(_("Nova"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://e1.cdn.bg:2060/fls' -T 'N0v4TV6#2' -a 'fls' -f 'WIN 18,0,0,232' -W 'http://i.cdn.bg/eflash/jwNTV/player.swf' -p 'http://i.cdn.bg/live/0OmMKJ4SgY' -y 'ntv_1.stream' | vlc --meta-title 'NOVA' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://e1.cdn.bg:2060/fls' -T 'N0v4TV6#2' -a 'fls' -f 'WIN 18,0,0,232' -W 'http://i.cdn.bg/eflash/jwNTV/player.swf' -p 'http://i.cdn.bg/live/0OmMKJ4SgY' -y 'ntv_1.stream' | mpv --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='NOVA' -\""); Main.notify(_("Watching Nova")); }); //onair this.TvItem.menu.addAction(_("On Air"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("vlc 'http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8' --meta-title 'On Air'"); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"mpv 'http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8' --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='On Air' \""); Main.notify(_("Watching On Air")); }); //thevoice this.TvItem.menu.addAction(_("The Voice"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); - Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://31.13.217.76/rtplive' -W 'http://www.thevoice.bg/js/thevoice_videostreem.swf' -p 'http://www.thevoice.bg/' -y 'thevoice_live.stream' -b '0' | vlc --meta-title 'The Voice' -\""); + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://31.13.217.76/rtplive' -W 'http://www.thevoice.bg/js/thevoice_videostreem.swf' -p 'http://www.thevoice.bg/' -y 'thevoice_live.stream' -b '0' | mpv --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='The Voice' -\""); Main.notify(_("Watching The Voice")); }); - //end tv drop down menu + //magictv + this.TvItem.menu.addAction(_("Magic TV"), function(event) { + Main.Util.spawnCommandLine("killall -9 mpv"); + Main.Util.spawnCommandLine("bash -c \"rtmpdump -r 'rtmp://31.13.217.76:1935/magictv' -W 'http://www.thevoice.bg/js/thevoice_videostreem.swf' -p 'http://www.thevoice.bg/' -y 'magictv_live.stream' -b '0' | mpv --config-dir=/home/$USER/.local/share/cinnamon/applets/BgRadio@spacy01/mpv --title='Magic TV' -\""); + Main.notify(_("Watching Magic TV")); + }); + + //end tv drop down menu this.menu.addMenuItem(this.TvItem); //kill this.menu.addAction(_("Stop"), function(event) { - Main.Util.spawnCommandLine("killall -9 vlc"); + Main.Util.spawnCommandLine("killall -9 mpv"); Main.Util.spawnCommandLine("killall -9 rtmpdump"); Main.notify(_("All Stop")); }); @@ -273,7 +280,9 @@ MyApplet.prototype = { }, on_applet_clicked: function(event) { - this.menu.toggle(); + Main.Util.spawnCommandLine("bash -c \" [ -f /usr/bin/rtmpdump ] || apturl apt://rtmpdump \""); + Main.Util.spawnCommandLine("bash -c \" [ -f /usr/bin/mpv ] || apturl apt://mpv \""); + this.menu.toggle(); }, @@ -282,4 +291,4 @@ MyApplet.prototype = { function main(metadata, orientation) { let myApplet = new MyApplet(orientation); return myApplet; -} +}; diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/metadata.json b/BgRadio@spacy01/files/BgRadio@spacy01/metadata.json index 0abc91eb9ba..5b759bece13 100755 --- a/BgRadio@spacy01/files/BgRadio@spacy01/metadata.json +++ b/BgRadio@spacy01/files/BgRadio@spacy01/metadata.json @@ -1,6 +1,6 @@ { "uuid": "BgRadio@spacy01", - "description": "The most famous bulgarian radio and TV streams. Some of the streams are available only from bulgaria. To watch a TVs, you'll need to install rtmpdump package.", + "description": "The most famous bulgarian radio and TV streams. Some of the streams are available only from bulgaria. To watch a TVs, you'll need to install rtmpdump and mpv packages.", "name": "Bulgarian Radio and TV Streams", "last-edited": 1508561972, "icon": "tvtime" diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/mpv/input.conf b/BgRadio@spacy01/files/BgRadio@spacy01/mpv/input.conf new file mode 100644 index 00000000000..2de885c575b --- /dev/null +++ b/BgRadio@spacy01/files/BgRadio@spacy01/mpv/input.conf @@ -0,0 +1,17 @@ +MOUSE_BTN1 ignore +MOUSE_BTN2 ignore +MOUSE_BTN3 ignore +MOUSE_BTN4 ignore +MOUSE_BTN5 ignore +MOUSE_BTN6 ignore +MOUSE_BTN7 ignore +MOUSE_BTN8 ignore +WHEEL_UP ignore +WHEEL_DOWN ignore +AXIS_UP ignore +AXIS_DOWN ignore +p ignore +q ignore +SPACE ignore +ENTER cycle fullscreen +KP_ENTER cycle fullscreen diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/mpv/mpv.conf b/BgRadio@spacy01/files/BgRadio@spacy01/mpv/mpv.conf new file mode 100644 index 00000000000..66565050bcf --- /dev/null +++ b/BgRadio@spacy01/files/BgRadio@spacy01/mpv/mpv.conf @@ -0,0 +1 @@ +osc=no diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/po/BgRadio@spacy01.pot b/BgRadio@spacy01/files/BgRadio@spacy01/po/BgRadio@spacy01.pot index 7e1a9abbabc..b8eb233459b 100644 --- a/BgRadio@spacy01/files/BgRadio@spacy01/po/BgRadio@spacy01.pot +++ b/BgRadio@spacy01/files/BgRadio@spacy01/po/BgRadio@spacy01.pot @@ -264,6 +264,14 @@ msgstr "" msgid "Watching The Voice" msgstr "" +#: applet.js +msgid "Magic TV" +msgstr "" + +#: applet.js +msgid "Watching Magic TV" +msgstr "" + #: applet.js msgid "All Stop" msgstr "" @@ -271,7 +279,7 @@ msgstr "" #. BgRadio@spacy01->metadata.json->description msgid "" "The most famous bulgarian radio and TV streams. Some of the streams are available " -"only from bulgaria. To watch a TVs, you'll need to install rtmpdump package." +"only from bulgaria. To watch a TVs, you'll need to install rtmpdump and mpv packages." msgstr "" "" "" diff --git a/BgRadio@spacy01/files/BgRadio@spacy01/po/bg.po b/BgRadio@spacy01/files/BgRadio@spacy01/po/bg.po index 332d6c7e515..2f33b76a705 100644 --- a/BgRadio@spacy01/files/BgRadio@spacy01/po/bg.po +++ b/BgRadio@spacy01/files/BgRadio@spacy01/po/bg.po @@ -262,6 +262,14 @@ msgstr "The Voice" msgid "Watching The Voice" msgstr "Гледате The Voice" +#: applet.js +msgid "Magic TV" +msgstr "Magic TV" + +#: applet.js +msgid "Watching Magic TV" +msgstr "Гледате Magic TV" + #: applet.js msgid "All Stop" msgstr "Всичко е спряно" @@ -270,10 +278,10 @@ msgstr "Всичко е спряно" msgid "" "The most famous bulgarian radio and TV streams. Some of the streams are " "available only from bulgaria. To watch a TVs, you'll need to install " -"rtmpdump package." +"rtmpdump and mpv packages." msgstr "" "Най-известните български радиа и телевизии. Някои от тях са налични само от " -"България. За да гледате телевизия, ще имате нужда от пакета rtmpdump." +"България. За да гледате телевизия, ще имате нужда от пакетите rtmpdump и mpv." #. BgRadio@spacy01->metadata.json->name msgid "Bulgarian Radio and TV Streams"