mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/global.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-01 11:04:00 +02:00
parent 2f7743c901 57c803b083
commit 134a82959d
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
acinclude.m4
View File

@@ -123,43 +123,61 @@ if test "$TARGET" = "cdk"; then
fi fi
TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config, TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
[--with-configdir=PATH ],[where to find the config files]) [--with-configdir=PATH ],[where to find the config files])
TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox, TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
[--with-datadir=PATH ],[where to find data]) [--with-datadir=PATH ],[where to find data])
TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts, TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
[--with-fontdir=PATH ],[where to find the fonts]) [--with-fontdir=PATH ],[where to find the fonts])
TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fonts,
[--with-fontdir_var=PATH ],[where to find the fonts in /var])
TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
[--with-gamesdir=PATH ],[where games data is stored]) [--with-gamesdir=PATH ],[where games data is stored])
TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox, TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
[--with-libdir=PATH ],[where to find the internal libs]) [--with-libdir=PATH ],[where to find the internal libs])
TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins, TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
[--with-plugindir=PATH ],[where to find the plugins]) [--with-plugindir=PATH ],[where to find the plugins])
TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
[--with-plugindir_var=PATH ],[where to find the plugins in /var])
TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
[--with-plugindir_mnt=PATH ],[where to find the the extern plugins])
TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins, TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
[--with-luaplugindir=PATH ],[where to find Lua plugins]) [--with-luaplugindir=PATH ],[where to find Lua plugins])
TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale, TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
[--with-localedir=PATH ],[where to find the locale]) [--with-localedir=PATH ],[where to find the locale])
TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale,
[--with-localedir_var=PATH ],[where to find the locale in /var])
TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes, TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
[--with-themesdir=PATH ],[where to find the themes]) [--with-themesdir=PATH ],[where to find the themes])
TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
[--with-themesdir_var=PATH ],[where to find the themes in /var])
TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons, TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
[--with-iconsdir=PATH ],[where to find the icons]) [--with-iconsdir=PATH ],[where to find the icons])
TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
[--with-iconsdir_var=PATH ],[where to find the icons in /var])
TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd, TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
[--with-private_httpddir=PATH ],[where to find the the private httpd files]) [--with-private_httpddir=PATH ],[where to find the the private httpd files])
TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd, TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
[--with-public_httpddir=PATH ],[where to find the the public httpd files]) [--with-public_httpddir=PATH ],[where to find the the public httpd files])
TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted, TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
[--with-hosted_httpddir=PATH ],[where to find the the hosted files]) [--with-hosted_httpddir=PATH ],[where to find the the hosted files])
]) ])
dnl automake <= 1.6 needs this specifications dnl automake <= 1.6 needs this specifications

7
src/global.h
View File

@@ -48,13 +48,6 @@
#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf" #define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked" #define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked"
#define FONTDIR_VAR "/var/tuxbox/fonts/" //NI
#define ICONSDIR_VAR "/var/tuxbox/icons/"
#define LOCALEDIR_VAR "/var/tuxbox/locale"
#define THEMESDIR_VAR "/var/tuxbox/themes"
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins"
#define LOGODIR ICONSDIR "/logo" #define LOGODIR ICONSDIR "/logo"
#define LOGODIR_VAR ICONSDIR_VAR "/logo" #define LOGODIR_VAR ICONSDIR_VAR "/logo"

4
src/gui/moviebrowser/mb.cpp
View File

@@ -1361,7 +1361,7 @@ void CMovieBrowser::refreshMovieInfo(void)
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY); //printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY);
int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10; int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10;
int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2; int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2;
short pb_hdd_offset = g_settings.infobar_show_sysfs_hdd ? 104 : 0; short pb_hdd_offset = 104;
if (show_mode == MB_SHOW_YT) if (show_mode == MB_SHOW_YT)
pb_hdd_offset = 0; pb_hdd_offset = 0;
@@ -1439,7 +1439,7 @@ void CMovieBrowser::refreshMovieInfo(void)
void CMovieBrowser::info_hdd_level(bool paint_hdd) void CMovieBrowser::info_hdd_level(bool paint_hdd)
{ {
if (show_mode == MB_SHOW_YT || !g_settings.infobar_show_sysfs_hdd) if (show_mode == MB_SHOW_YT)
return; return;
struct statfs s; struct statfs s;