Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix SystemGlobals.cpp - remove g_Joystick when not needed #1140

Merged
merged 1 commit into from

2 participants

@Karlson2k
Collaborator

As commented here: e00733f#commitcomment-1553832

@jmarshallnz jmarshallnz closed this
@jmarshallnz jmarshallnz reopened this
@jmarshallnz jmarshallnz merged commit 78ea782 into from
@tru tru referenced this pull request from a commit in RasPlex/plex-home-theatre
@tru tru Play everything from a PlayQueue
Create a playQueue even if we just play one item.
This had some far-reaching implications, especially for our old
PlexContentPlayerMixin that was not really going to work for PlayQueues.

The Resume/Select Media Part dialogs was moved to GUIDialogPlexMedia
and is called from MediaDecisionEngine to be able to show that when
it’s coming from a queue. This will only show for the first item in a
queue.

By removing PlexContentPlayerMixin a lot of classes had to be changed
because of include files and also because they had to call the
playQueueManager to play items instead.

This also lead to some refactoring of the way we play photos since
these are not supported by PlayQueues right now.

Fixes #1140
17bcf2e
@tru tru referenced this pull request from a commit in RasPlex/plex-home-theatre
@tru tru Play everything from a PlayQueue
Create a playQueue even if we just play one item.
This had some far-reaching implications, especially for our old
PlexContentPlayerMixin that was not really going to work for PlayQueues.

The Resume/Select Media Part dialogs was moved to GUIDialogPlexMedia
and is called from MediaDecisionEngine to be able to show that when
it’s coming from a queue. This will only show for the first item in a
queue.

By removing PlexContentPlayerMixin a lot of classes had to be changed
because of include files and also because they had to call the
playQueueManager to play items instead.

This also lead to some refactoring of the way we play photos since
these are not supported by PlayQueues right now.

Fixes #1140
43b026f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/SystemGlobals.cpp
View
4 xbmc/SystemGlobals.cpp
@@ -43,7 +43,7 @@
#endif
#if defined(TARGET_WINDOWS)
#include "input/windows/WINJoystick.h"
-#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+#elif defined(HAS_SDL_JOYSTICK)
#include "input/SDLJoystick.h"
#endif
@@ -64,7 +64,7 @@
CGUITextureManager g_TextureManager;
CGUILargeTextureManager g_largeTextureManager;
CMouseStat g_Mouse;
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+#if defined(HAS_SDL_JOYSTICK)
CJoystick g_Joystick;
#endif
CGUIPassword g_passwordManager;
Something went wrong with that request. Please try again.