mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-09 14:48:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

- moviebrowser: allow to display record time

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

include fix of broken build
This commit is contained in:
svenhoefer
2018-07-05 21:38:31 +02:00
committed by Thilo Graf
parent d0b8924d24
commit 1002b4bfb3
7 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -1771,6 +1771,7 @@ moviebrowser.info_prodyear Jahr
moviebrowser.info_quality Qualität
moviebrowser.info_rating Bewertung
moviebrowser.info_recorddate Aufnahmedatum
moviebrowser.info_recordtime Aufnahmezeit
moviebrowser.info_serie Serie
moviebrowser.info_size Dateigröße (MB)
moviebrowser.info_spacer Abstandshalter
@@ -1821,6 +1822,7 @@ moviebrowser.short_prodyear Jahr
moviebrowser.short_quality Qualität
moviebrowser.short_rating Vote
moviebrowser.short_recorddate Datum
moviebrowser.short_recordtime Zeit
moviebrowser.short_serie Serie
moviebrowser.short_size Größe
moviebrowser.short_spacer

2
data/locale/english.locale
View File

@@ -1771,6 +1771,7 @@ moviebrowser.info_prodyear Year
moviebrowser.info_quality Quality
moviebrowser.info_rating Rating
moviebrowser.info_recorddate Record date
moviebrowser.info_recordtime Record time
moviebrowser.info_serie Serie
moviebrowser.info_size File size (MB)
moviebrowser.info_spacer Spacer
@@ -1821,6 +1822,7 @@ moviebrowser.short_prodyear Year
moviebrowser.short_quality * (quality)
moviebrowser.short_rating Vote
moviebrowser.short_recorddate Date
moviebrowser.short_recordtime Time
moviebrowser.short_serie Serie
moviebrowser.short_size MB
moviebrowser.short_spacer

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

@@ -91,7 +91,7 @@ typedef struct dirent64 dirent_struct;
#define NUMBER_OF_MOVIES_LAST 40 // This is the number of movies shown in last recored and last played list
#define MOVIE_SMSKEY_TIMEOUT 800
#define MESSAGEBOX_BROWSER_ROW_ITEM_COUNT 22
#define MESSAGEBOX_BROWSER_ROW_ITEM_COUNT 23
const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_ROW_ITEM_COUNT] =
{
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME },
@@ -115,7 +115,8 @@ const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_
{ MB_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH },
{ MB_INFO_SIZE, LOCALE_MOVIEBROWSER_INFO_SIZE },
{ MB_INFO_RATING, LOCALE_MOVIEBROWSER_INFO_RATING },
{ MB_INFO_SPACER, LOCALE_MOVIEBROWSER_INFO_SPACER }
{ MB_INFO_SPACER, LOCALE_MOVIEBROWSER_INFO_SPACER },
{ MB_INFO_RECORDTIME, LOCALE_MOVIEBROWSER_INFO_RECORDTIME }
};
#define MESSAGEBOX_YES_NO_OPTIONS_COUNT 2
@@ -174,6 +175,7 @@ const neutrino_locale_t m_localizedItemName[MB_INFO_MAX_NUMBER+1] =
LOCALE_MOVIEBROWSER_SHORT_SIZE,
LOCALE_MOVIEBROWSER_SHORT_RATING,
LOCALE_MOVIEBROWSER_SHORT_SPACER,
LOCALE_MOVIEBROWSER_SHORT_RECORDTIME,
NONEXISTANT_LOCALE
};
@@ -200,6 +202,7 @@ const neutrino_locale_t m_localizedItemName[MB_INFO_MAX_NUMBER+1] =
#define MB_ROW_WIDTH_SIZE 12
#define MB_ROW_WIDTH_RATING 5
#define MB_ROW_WIDTH_SPACER 1
#define MB_ROW_WIDTH_RECORDTIME 10
const int m_defaultRowWidth[MB_INFO_MAX_NUMBER+1] =
{
@@ -225,6 +228,7 @@ const int m_defaultRowWidth[MB_INFO_MAX_NUMBER+1] =
MB_ROW_WIDTH_SIZE,
MB_ROW_WIDTH_RATING,
MB_ROW_WIDTH_SPACER,
MB_ROW_WIDTH_RECORDTIME,
0 //MB_ROW_WIDTH_MAX_NUMBER
};
static MI_MOVIE_INFO* playing_info;
@@ -3851,7 +3855,6 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
*item_string = str_tmp;
}
break;
case MB_INFO_RECORDDATE: // = 13,
if (show_mode == MB_SHOW_YT) {
*item_string = movie_info.ytdate;
@@ -3894,7 +3897,15 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
case MB_INFO_SPACER: // = 21,
*item_string="";
break;
case MB_INFO_MAX_NUMBER: // = 22
case MB_INFO_RECORDTIME: // = 22,
if (show_mode == MB_SHOW_RECORDS)
{
tm_tmp = localtime(&movie_info.file.Time);
snprintf(str_tmp, sizeof(str_tmp),"%02d:%02d", tm_tmp->tm_hour, tm_tmp->tm_min);
*item_string = str_tmp;
}
break;
case MB_INFO_MAX_NUMBER: // = 23
default:
*item_string="";
result = false;

3
src/gui/moviebrowser/mb_functions.h
View File

@@ -162,7 +162,8 @@ bool (* const sortBy[MB_INFO_MAX_NUMBER+1])(const MI_MOVIE_INFO* a, const MI_MOV
&sortBySize, //MB_INFO_SIZE = 19,
&sortByRating, //MB_INFO_RATING = 20,
NULL, //MB_INFO_SPACER = 21,
NULL //MB_INFO_MAX_NUMBER = 22
NULL, //MB_INFO_RECORDTIME = 22,
NULL //MB_INFO_MAX_NUMBER = 23
};
#endif /*__MB_FUNCTIONS__*/

3
src/gui/moviebrowser/mb_types.h
View File

@@ -67,7 +67,8 @@ typedef enum
MB_INFO_SIZE = 19,
MB_INFO_RATING = 20,
MB_INFO_SPACER = 21,
MB_INFO_MAX_NUMBER = 22 // MUST be allways the last item in the list
MB_INFO_RECORDTIME = 22,
MB_INFO_MAX_NUMBER = 23 // MUST be allways the last item in the list
}MB_INFO_ITEM;
typedef enum

2
src/system/locals.h
View File

@@ -1798,6 +1798,7 @@ typedef enum
LOCALE_MOVIEBROWSER_INFO_QUALITY,
LOCALE_MOVIEBROWSER_INFO_RATING,
LOCALE_MOVIEBROWSER_INFO_RECORDDATE,
LOCALE_MOVIEBROWSER_INFO_RECORDTIME,
LOCALE_MOVIEBROWSER_INFO_SERIE,
LOCALE_MOVIEBROWSER_INFO_SIZE,
LOCALE_MOVIEBROWSER_INFO_SPACER,
@@ -1848,6 +1849,7 @@ typedef enum
LOCALE_MOVIEBROWSER_SHORT_QUALITY,
LOCALE_MOVIEBROWSER_SHORT_RATING,
LOCALE_MOVIEBROWSER_SHORT_RECORDDATE,
LOCALE_MOVIEBROWSER_SHORT_RECORDTIME,
LOCALE_MOVIEBROWSER_SHORT_SERIE,
LOCALE_MOVIEBROWSER_SHORT_SIZE,
LOCALE_MOVIEBROWSER_SHORT_SPACER,

2
src/system/locals_intern.h
View File

@@ -1798,6 +1798,7 @@ const char * locale_real_names[] =
"moviebrowser.info_quality",
"moviebrowser.info_rating",
"moviebrowser.info_recorddate",
"moviebrowser.info_recordtime",
"moviebrowser.info_serie",
"moviebrowser.info_size",
"moviebrowser.info_spacer",
@@ -1848,6 +1849,7 @@ const char * locale_real_names[] =
"moviebrowser.short_quality",
"moviebrowser.short_rating",
"moviebrowser.short_recorddate",
"moviebrowser.short_recordtime",
"moviebrowser.short_serie",
"moviebrowser.short_size",
"moviebrowser.short_spacer",