mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-13 13:52:49 +02:00
parent 2c5bf73006 1fae4130b8
commit 4e232439c3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/icons.h
View File

@@ -101,7 +101,6 @@
#define NEUTRINO_ICON_MOUNTED "mounted" #define NEUTRINO_ICON_MOUNTED "mounted"
#define NEUTRINO_ICON_MULTIMEDIA "multimedia" #define NEUTRINO_ICON_MULTIMEDIA "multimedia"
#define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer" #define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer"
#define NEUTRINO_ICON_NKPLAY "icon_nkplay"
#define NEUTRINO_ICON_YTPLAY "icon_ytplay" #define NEUTRINO_ICON_YTPLAY "icon_ytplay"
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted" #define NEUTRINO_ICON_NOT_MOUNTED "not_mounted"
#define NEUTRINO_ICON_PAUSE "mp_pause" #define NEUTRINO_ICON_PAUSE "mp_pause"
@@ -295,7 +294,6 @@
#define NEUTRINO_ICON_GREEN_9 "9-green" #define NEUTRINO_ICON_GREEN_9 "9-green"
/* misc */ /* misc */
#define NEUTRINO_ICON_HINT_NKPLAY "hint_nkplay"
#define NEUTRINO_ICON_HINT_YTPLAY "hint_ytplay" #define NEUTRINO_ICON_HINT_YTPLAY "hint_ytplay"
#define NEUTRINO_ICON_HINT_SPARK "hint_spark" #define NEUTRINO_ICON_HINT_SPARK "hint_spark"

2
src/neutrino.cpp
View File

@@ -4377,7 +4377,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
hintBox.hide(); hintBox.hide();
} }
else if(actionKey=="nkplayback" || actionKey=="ytplayback" || actionKey=="tsmoviebrowser" || actionKey=="fileplayback") { else if(actionKey=="ytplayback" || actionKey=="tsmoviebrowser" || actionKey=="fileplayback") {
frameBuffer->Clear(); frameBuffer->Clear();
if(mode == NeutrinoMessages::mode_radio ) if(mode == NeutrinoMessages::mode_radio )
frameBuffer->stopFrame(); frameBuffer->stopFrame();