mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
New XBMC checker functionality: 3D video detection (filename based) and screensaver detection
Former-commit-id: ea95e4ecde3ab9378bdf9c4c60950713947bd0ac
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
// Utils includes
|
||||
#include <utils/GrabbingMode.h>
|
||||
#include <utils/VideoMode.h>
|
||||
|
||||
///
|
||||
/// This class will check if XBMC is playing something. When it does not, this class will send all black data to Hyperion.
|
||||
@@ -33,13 +34,14 @@ public:
|
||||
///
|
||||
/// @param address Network address of the XBMC instance
|
||||
/// @param port Port number to use (XBMC default = 9090)
|
||||
/// @param interval The interval at which XBMC is polled
|
||||
/// @param grabVideo Whether or not to grab when the XBMC video player is playing
|
||||
/// @param grabPhoto Whether or not to grab when the XBMC photo player is playing
|
||||
/// @param grabAudio Whether or not to grab when the XBMC audio player is playing
|
||||
/// @param grabMenu Whether or not to grab when nothing is playing (in XBMC menu)
|
||||
/// @param grabScreensaver Whether or not to grab when the XBMC screensaver is activated
|
||||
/// @param enable3DDetection Wheter or not to enable the detection of 3D movies playing
|
||||
///
|
||||
XBMCVideoChecker(const std::string & address, uint16_t port, uint64_t interval, bool grabVideo, bool grabPhoto, bool grabAudio, bool grabMenu);
|
||||
XBMCVideoChecker(const std::string & address, uint16_t port, bool grabVideo, bool grabPhoto, bool grabAudio, bool grabMenu, bool grabScreensaver, bool enable3DDetection);
|
||||
|
||||
///
|
||||
/// Start polling XBMC
|
||||
@@ -47,19 +49,34 @@ public:
|
||||
void start();
|
||||
|
||||
signals:
|
||||
/// Signal emitted when the grabbing mode changes
|
||||
void grabbingMode(GrabbingMode grabbingMode);
|
||||
|
||||
private slots:
|
||||
///
|
||||
/// Send a request to XBMC
|
||||
///
|
||||
void sendRequest();
|
||||
/// Signal emitted when a 3D movie is detected
|
||||
void videoMode(VideoMode videoMode);
|
||||
|
||||
///
|
||||
private slots:
|
||||
/// Receive a reply from XBMC
|
||||
///
|
||||
void receiveReply();
|
||||
|
||||
/// Called when connected to XBMC
|
||||
void connected();
|
||||
|
||||
/// Called when disconnected from XBMC
|
||||
void disconnected();
|
||||
|
||||
/// Called when a connection error was encountered
|
||||
void connectionError(QAbstractSocket::SocketError error);
|
||||
|
||||
private:
|
||||
/// Set the grabbing mode
|
||||
void setGrabbingMode(GrabbingMode grabbingMode);
|
||||
|
||||
void setScreensaverMode(bool isOnScreensaver);
|
||||
|
||||
/// Set the video mode
|
||||
void setVideoMode(VideoMode videoMode);
|
||||
|
||||
private:
|
||||
/// The network address of the XBMC instance
|
||||
const QString _address;
|
||||
@@ -67,27 +84,42 @@ private:
|
||||
/// The port number of XBMC
|
||||
const uint16_t _port;
|
||||
|
||||
/// The JSON-RPC request message
|
||||
const QByteArray _request;
|
||||
/// The JSON-RPC message to check the active player
|
||||
const QString _activePlayerRequest;
|
||||
|
||||
/// The timer that schedules XBMC queries
|
||||
QTimer _timer;
|
||||
/// The JSON-RPC message to check the currently playing file
|
||||
const QString _currentPlayingItemRequest;
|
||||
|
||||
/// The JSON-RPC message to check the screensaver
|
||||
const QString _checkScreensaverRequest;
|
||||
|
||||
/// The QT TCP Socket with connection to XBMC
|
||||
QTcpSocket _socket;
|
||||
|
||||
/// Flag indicating whether or not to grab when the XBMC video player is playing
|
||||
bool _grabVideo;
|
||||
const bool _grabVideo;
|
||||
|
||||
/// Flag indicating whether or not to grab when the XBMC photo player is playing
|
||||
bool _grabPhoto;
|
||||
const bool _grabPhoto;
|
||||
|
||||
/// Flag indicating whether or not to grab when the XBMC audio player is playing
|
||||
bool _grabAudio;
|
||||
const bool _grabAudio;
|
||||
|
||||
/// Flag indicating whether or not to grab when XBMC is playing nothing (in menu)
|
||||
bool _grabMenu;
|
||||
const bool _grabMenu;
|
||||
|
||||
/// Previous emitted grab state
|
||||
GrabbingMode _previousMode;
|
||||
/// Flag inidcating whether or not to grab when the XBMC screensaver is activated
|
||||
const bool _grabScreensaver;
|
||||
|
||||
/// Flag indicating wheter or not to enable the detection of 3D movies playing
|
||||
const bool _enable3DDetection;
|
||||
|
||||
/// Flag indicating if XBMC is on screensaver
|
||||
bool _previousScreensaverMode;
|
||||
|
||||
/// Previous emitted grab mode
|
||||
GrabbingMode _previousGrabbingMode;
|
||||
|
||||
/// Previous emitted video mode
|
||||
VideoMode _previousVideoMode;
|
||||
};
|
||||
|
Reference in New Issue
Block a user