Started DisplayReplay + Fixes

9 files changed, 59 insertions, 4 deletions

diff --git a/Config.cpp b/Config.cpp
index 30baac8..c8eb1aa 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -107,6 +107,8 @@ bool Config::Parse(const char *name, const char *value)
 	else if (strcasecmp(name, "DetailGridRows") == 0) 	Config::GetInstance().DetailGridRows = atoi(value);
 	else if (strcasecmp(name, "ListGridColumns") == 0) 	Config::GetInstance().ListGridColumns = atoi(value);
 	else if (strcasecmp(name, "ListGridRows") == 0) 	Config::GetInstance().ListGridRows = atoi(value);
+	else if (strcasecmp(name, "ExtrasGridColumns") == 0) 	Config::GetInstance().ExtrasGridColumns = atoi(value);
+	else if (strcasecmp(name, "ExtrasGridRows") == 0) 	Config::GetInstance().ExtrasGridRows = atoi(value);
 	else if (strcasecmp(name, "UseMpv") == 0) 	Config::GetInstance().UseMpv = atoi(value) ? true : false;
 	else if (strcasecmp(name, "ScrollByPage") == 0) 	Config::GetInstance().ScrollByPage = atoi(value) ? true : false;
 	else if (strcasecmp(name, "ScrollAllAround") == 0) 	Config::GetInstance().ScrollAllAround = atoi(value) ? true : false;
@@ -157,6 +159,8 @@ cMyMenuSetupPage::cMyMenuSetupPage(void)
 	DetailGridRows = Config::GetInstance().DetailGridRows;
 	ListGridColumns = Config::GetInstance().ListGridColumns;
 	ListGridRows = Config::GetInstance().ListGridRows;
+	ExtrasGridColumns = Config::GetInstance().ExtrasGridColumns;
+	ExtrasGridRows = Config::GetInstance().ExtrasGridRows;
 	UseMpv = Config::GetInstance().UseMpv;
 	ScrollByPage = Config::GetInstance().ScrollByPage;
 	ScrollAllAround = Config::GetInstance().ScrollAllAround;
@@ -192,6 +196,9 @@ cMyMenuSetupPage::cMyMenuSetupPage(void)
 	Add(new cMenuEditIntItem(tr("List Grid Columns"), &ListGridColumns));
 	Add(new cMenuEditIntItem(tr("List Grid Rows"), &ListGridRows));
 	
+	Add(new cMenuEditIntItem(tr("Extras Grid Columns"), &ExtrasGridColumns));
+	Add(new cMenuEditIntItem(tr("Extras Grid Rows"), &ExtrasGridRows));
+	
 	cMenuEditStrItem* devUUID = new cMenuEditStrItem(tr("Current UUID"), Uuid, STRING_SIZE);
 	devUUID->SetSelectable(false);
 	Add(devUUID);
@@ -216,6 +223,8 @@ void cMyMenuSetupPage::Store(void)
 	Config::GetInstance().DetailGridRows = DetailGridRows;
 	Config::GetInstance().ListGridColumns = ListGridColumns;
 	Config::GetInstance().ListGridRows = ListGridRows;
+	Config::GetInstance().ExtrasGridColumns = ExtrasGridColumns;
+	Config::GetInstance().ExtrasGridRows = ExtrasGridRows;
 	Config::GetInstance().DefaultViewMode = (ViewMode)DefaultViewMode;
 	Config::GetInstance().UseMpv = UseMpv;
 	Config::GetInstance().ScrollByPage = ScrollByPage;
@@ -238,6 +247,8 @@ void cMyMenuSetupPage::Store(void)
 	SetupStore("DetailGridRows", Config::GetInstance().DetailGridRows);
 	SetupStore("ListGridColumns", Config::GetInstance().ListGridColumns);
 	SetupStore("ListGridRows", Config::GetInstance().ListGridRows);
+	SetupStore("ExtrasGridColumns", Config::GetInstance().ExtrasGridColumns);
+	SetupStore("ExtrasGridRows", Config::GetInstance().ExtrasGridRows);
 	SetupStore("DefaultViewMode", Config::GetInstance().DefaultViewMode);
 	SetupStore("UseMpv", Config::GetInstance().UseMpv);
 	SetupStore("ScrollByPage", Config::GetInstance().ScrollByPage);
diff --git a/Config.h b/Config.h
index 0a31ae1..d11093a 100644
--- a/Config.h
+++ b/Config.h
@@ -118,6 +118,8 @@ class cMyMenuSetupPage:public cMenuSetupPage
 	int DetailGridRows;
 	int ListGridColumns;
 	int ListGridRows;
+	int ExtrasGridColumns;
+	int ExtrasGridRows;
 	int DefaultViewMode;
 	int UseMpv;
 	int ScrollByPage;
diff --git a/Makefile b/Makefile
index 1eed6d1..55c4098 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,8 @@ OBJS += plexSdOsd.o \
 	browserGrid.o \
 	viewHeader.o \
 	detailView.o \
-	pictureCache.o 
+	pictureCache.o \
+	displayReplaySD.o
 endif
 
 SRCS = $(wildcard $(OBJS:.o=.c)) $(PLUGIN).cpp
diff --git a/detailView.cpp b/detailView.cpp
index 6f9880a..8479a46 100644
--- a/detailView.cpp
+++ b/detailView.cpp
@@ -14,7 +14,7 @@ cDetailView::cDetailView(std::shared_ptr<skindesignerapi::cOsdView> detailView,
 
 	m_pGrid = NULL;
 	SetViewGrid(std::shared_ptr<skindesignerapi::cViewGrid>(detailView->GetViewGrid((int)eViewDetailViewGrids::extras)));
-	SetGridDimensions(Config::GetInstance().ExtrasGridColumns, Config::GetInstance().ExtrasGridRows);
+	SetGridDimensions(Config::GetInstance().ExtrasGridRows, Config::GetInstance().ExtrasGridColumns);
 }
 
 void cDetailView::Flush()
diff --git a/displayReplaySD.cpp b/displayReplaySD.cpp
new file mode 100644
index 0000000..11c99e8
--- /dev/null
+++ b/displayReplaySD.cpp
@@ -0,0 +1,10 @@
+#include "displayReplaySD.h"
+
+cDisplayReplaySD::cDisplayReplaySD(plexclient::Video* video)
+{
+}
+
+cDisplayReplaySD::~cDisplayReplaySD()
+{
+}
+
diff --git a/displayReplaySD.h b/displayReplaySD.h
new file mode 100644
index 0000000..f38be4b
--- /dev/null
+++ b/displayReplaySD.h
@@ -0,0 +1,18 @@
+#ifndef CDISPLAYREPLAYSD_H
+#define CDISPLAYREPLAYSD_H
+
+#include "PVideo.h"
+#include <memory>
+#include "tokendefinitions.h"
+#include  <libskindesignerapi/osdelements.h>
+#include  <libskindesignerapi/skindesignerosdbase.h>
+
+class cDisplayReplaySD
+{
+public:
+	cDisplayReplaySD(plexclient::Video* video);
+	~cDisplayReplaySD();
+
+};
+
+#endif // CDISPLAYREPLAYSD_H
diff --git a/plex.cpp b/plex.cpp
index d890959..d6e7951 100644
--- a/plex.cpp
+++ b/plex.cpp
@@ -70,7 +70,7 @@ bool cMyPlugin::Start(void)
 	m_pPlugStruct = new skindesignerapi::cPluginStructure();
 	m_pPlugStruct->name = "plex";
 	m_pPlugStruct->libskindesignerAPIVersion = LIBSKINDESIGNERAPIVERSION;
-	
+		
 	m_pPlugStruct->RegisterRootView("root.xml");
 	skindesignerapi::cTokenContainer *tkBackground = new skindesignerapi::cTokenContainer();
 	cPlexSdOsd::DefineTokens(eViewElementsRoot::background, tkBackground);
@@ -136,6 +136,12 @@ bool cMyPlugin::Start(void)
 	cPlexSdOsd::DefineGridTokens(tkDetailExtraGrid);
 	m_pPlugStruct->RegisterViewGrid((int)eViews::detailView, (int)eViewDetailViewGrids::extras, "extragrid", tkDetailExtraGrid);
 	
+	
+	m_pPlugStructReplay = new skindesignerapi::cPluginStructure();
+	m_pPlugStructReplay->name = "plexreplay";
+	m_pPlugStructReplay->libskindesignerAPIVersion = LIBSKINDESIGNERAPIVERSION;
+	m_pPlugStructReplay->RegisterRootView("root.xml");
+	
 	if (!skindesignerapi::SkindesignerAPI::RegisterPlugin(m_pPlugStruct)) {
 		esyslog("[plex]: skindesigner not available");
 		bSkindesigner = false;
diff --git a/plex.h b/plex.h
index a7317ac..8cbda0c 100644
--- a/plex.h
+++ b/plex.h
@@ -47,6 +47,7 @@ class cMyPlugin:public cPlugin
 private:
 #ifdef SKINDESIGNER
 	skindesignerapi::cPluginStructure *m_pPlugStruct;
+	skindesignerapi::cPluginStructure *m_pPlugStructReplay;
 	cPlexSdOsd *m_pTestOsd;
 	static bool bSkindesigner;
 #endif
diff --git a/po/de_DE.po b/po/de_DE.po
index c48775b..e273dac 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-plex 0.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2016-03-09 21:22+0100\n"
+"POT-Creation-Date: 2016-03-17 20:29+0100\n"
 "PO-Revision-Date: 2016-03-09 21:24+0200\n"
 "Last-Translator: Chris <zerov83@gmail.com>\n"
 "Language-Team: chriszero\n"
@@ -78,6 +78,12 @@ msgstr "Spalten im Listen Modus"
 msgid "List Grid Rows"
 msgstr "Reihen im Listen Modus"
 
+msgid "Extras Grid Columns"
+msgstr ""
+
+msgid "Extras Grid Rows"
+msgstr ""
+
 msgid "Current UUID"
 msgstr "Aktuelle UUID"