From f70166a261293c3902730c49b2d85d80c29e91d4 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 1 Feb 2016 16:53:17 +0100
Subject: [PATCH] moviebrowser: allow to show detailed infos about bookmarks

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/48261501a7c895ec519133913877f78b95bbfbad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-01 (Mon, 01 Feb 2016)

Origin message was:
------------------
- moviebrowser: allow to show detailed infos about bookmarks

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 data/locale/deutsch.locale |  2 +-
 src/gui/moviebrowser.cpp   | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index debd59fac..dddb197b9 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1700,7 +1700,7 @@ moviebrowser.serie_auto_create Serien automatisch zuordnen
 moviebrowser.serie_head Serie
 moviebrowser.serie_name Name ändern
 moviebrowser.short_audio Audio
-moviebrowser.short_book Markierung
+moviebrowser.short_book Mark.
 moviebrowser.short_channel Kanal
 moviebrowser.short_country Land
 moviebrowser.short_filename Name
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 5b38a3af5..d33ed4305 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -179,7 +179,7 @@ const neutrino_locale_t m_localizedItemName[MB_INFO_MAX_NUMBER+1] =
 #define	MB_ROW_WIDTH_INFO2		25
 #define	MB_ROW_WIDTH_PARENTAL_LOCKAGE	4
 #define	MB_ROW_WIDTH_CHANNEL		15
-#define	MB_ROW_WIDTH_BOOKMARK		4
+#define	MB_ROW_WIDTH_BOOKMARK		6
 #define	MB_ROW_WIDTH_QUALITY		10
 #define	MB_ROW_WIDTH_PREVPLAYDATE	12
 #define	MB_ROW_WIDTH_RECORDDATE		12
@@ -3280,6 +3280,9 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
 	int i=0;
 	int counter=0;
 
+	std::string b;
+	bool s, e, u;
+
 	switch(item)
 	{
 		case MB_INFO_FILENAME: 				// 		= 0,
@@ -3321,13 +3324,41 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
 			*item_string = movie_info.epgChannel;
 			break;
 		case MB_INFO_BOOKMARK: 				//		= 10,
+			b = "";
+
+			s = false;
+			if (movie_info.bookmarks.start != 0)
+			{
+				s = true;
+				b += "S";
+			}
+
+			e = false;
+			if (movie_info.bookmarks.end != 0)
+			{
+				e = true;
+				if (s)
+					b += ",";
+				b += "E";
+			}
+
 			// we just return the number of bookmarks
 			for (i = 0; i < MI_MOVIE_BOOK_USER_MAX; i++)
 			{
 				if (movie_info.bookmarks.user[i].pos != 0)
 					counter++;
 			}
-			*item_string = to_string(counter);;
+			u = (counter > 0);
+			if (u)
+			{
+				if (s || e)
+					b += ",";
+				b += "U[";
+				b += to_string(counter);
+				b += "]";
+			}
+
+			*item_string = b;
 			break;
 		case MB_INFO_QUALITY: 				// 		= 11,
 			snprintf(str_tmp, sizeof(str_tmp),"%d",movie_info.quality);