Skip to content

Commit

Permalink
add some logging and actually start the null-player
Browse files Browse the repository at this point in the history
  • Loading branch information
flensrocker committed Mar 4, 2016
1 parent 7415529 commit 22c5c81
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions nulldevice.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,14 @@ class cNullOsdProvider : public cOsdProvider {
virtual void DropImageData(int ImageHandle) {}

public:
cNullOsdProvider() : cOsdProvider() {}
virtual ~cNullOsdProvider() {}
cNullOsdProvider() : cOsdProvider()
{
isyslog("dbus2vdr: Null-Osd-Provider created");
}
virtual ~cNullOsdProvider()
{
isyslog("dbus2vdr: Null-Osd-Provider destroyed");
}
};


Expand All @@ -47,11 +53,13 @@ class cNullPlayer : public cPlayer {

cNullPlayer::cNullPlayer(void)
{
isyslog("dbus2vdr: Null-Player created");
}

cNullPlayer::~cNullPlayer()
cNullPlayer::~cNullPlayer(void)
{
Detach();
isyslog("dbus2vdr: Null-Player destroyed");
}


Expand All @@ -66,17 +74,19 @@ class cNullControl : public cControl {
virtual ~cNullControl(void);
};

cNullPlayer *cNullControl::Player;
cNullPlayer *cNullControl::Player = NULL;

cNullControl::cNullControl(void)
:cControl(Player = new cNullPlayer)
{
isyslog("dbus2vdr: Null-Control created");
}

cNullControl::~cNullControl()
cNullControl::~cNullControl(void)
{
delete Player;
Player = NULL;
isyslog("dbus2vdr: Null-Control destroyed");
}


Expand All @@ -85,7 +95,7 @@ void cNullDevice::MakePrimaryDevice(bool On)
cDevice::MakePrimaryDevice(On);
if (On) {
new cNullOsdProvider();
if (cNullControl::Player != NULL) {
if (cNullControl::Player == NULL) {
cControl::Launch(new cNullControl());
cControl::Attach();
}
Expand Down

0 comments on commit 22c5c81

Please sign in to comment.