Respect viewMode

Set and read viewMode, fixes xbmc#547
plexinc · Jul 29, 2013 · e4e60d8 · e4e60d8
1 parent cf49a82
commit e4e60d8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/plex/Client/PlexMediaServerClient.cpp b/plex/Client/PlexMediaServerClient.cpp
@@ -114,3 +114,17 @@ CPlexMediaServerClient::SetItemRating(const CFileItemPtr &item, float rating)
   AddJob(new CPlexMediaServerClientJob(u));
 }
 
+void
+CPlexMediaServerClient::SetViewMode(const CFileItem &item, int viewMode, int sortMode, int sortAsc)
+{
+  CURL u(item.GetPath());
+  u.SetFileName("/:/viewChange");
+  u.SetOption("identifier", item.GetProperty("identifier").asString());
+  u.SetOption("viewGroup", item.GetProperty("viewGroup").asString());
+
+  u.SetOption("viewMode", boost::lexical_cast<CStdString>(viewMode));
+  u.SetOption("sortMode", boost::lexical_cast<CStdString>(sortMode));
+  u.SetOption("sortAsc", boost::lexical_cast<CStdString>(sortAsc));
+
+  AddJob(new CPlexMediaServerClientJob(u));
+}
diff --git a/plex/Client/PlexMediaServerClient.h b/plex/Client/PlexMediaServerClient.h
@@ -65,6 +65,9 @@ class CPlexMediaServerClient : public CJobQueue
   void ReportItemProgress(const CFileItemPtr& item, MediaState state, int64_t currentPosition = 0);
   void ReportItemProgress(const CFileItemPtr& item, const CStdString& state, int64_t currentPosition = 0);
 
+  /* Set viewMode */
+  void SetViewMode(const CFileItem& item, int viewMode, int sortMode = -1, int sortAsc = 1);
+
 private:
   CStdString GetPrefix(const CFileItemPtr& item) const
   {

diff --git a/plex/FileSystem/PlexDirectory.cpp b/plex/FileSystem/PlexDirectory.cpp
@@ -29,6 +29,8 @@
 #include "Client/PlexServerDataLoader.h"
 #include "Client/MyPlex/MyPlexManager.h"
 
+#include "GUIViewState.h"
+
 using namespace XFILE;
 
 /* IDirectory Interface */
@@ -182,7 +184,7 @@ static AttributeMap g_attributeMap = boost::assign::list_of<AttributePair>
                                      ("bitrate", g_parserInt)
                                      ("samplingRate", g_parserInt)
                                      ("dialogNorm", g_parserInt)
-
+                                     ("viewMode", g_parserInt)
 
                                      ("filters", g_parserBool)
                                      ("refreshing", g_parserBool)
@@ -337,6 +339,16 @@ CPlexDirectory::ReadMediaContainer(TiXmlElement* root, CFileItemList& mediaConta
   CPlexDirectory::CopyAttributes(root, mediaContainer, m_url);
   g_parserKey->Process(m_url, "key", m_url.GetFileName(), mediaContainer);
 
+  /* set the view mode */
+  if (mediaContainer.HasProperty("viewMode"))
+  {
+    int viewMode = mediaContainer.GetProperty("viewMode").asInteger();
+    mediaContainer.SetDefaultViewMode(viewMode);
+    CGUIViewState *state = CGUIViewState::GetViewState(0, mediaContainer);
+    state->SaveViewAsControl(viewMode);
+  }
+
+  /* now read all the childs to the mediaContainer */
   ReadChildren(root, mediaContainer);
 
   /* We just use the first item Type, it might be wrong and we should maybe have a look... */

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -529,11 +529,7 @@ bool CGUIMediaWindow::OnMessage(CGUIMessage& message)
 #endif
 
       /* PLEX */
-      /*
-      PlexMediaServerQueue::Get().onViewModeChanged(m_vecItems->GetProperty("identifier").asString(),
-                                                    m_vecItems->GetPath(),
-                                                    m_vecItems->GetProperty("viewGroup").asString(),
-                                                    viewMode, -1, -1);*/
+      g_plexMediaServerClient.SetViewMode(*m_vecItems, viewMode);
       m_vecItems->SetDefaultViewMode(viewMode);
       /* END PLEX */