Skip to content

Commit 22c5c81

Browse files
committed
add some logging and actually start the null-player
1 parent 7415529 commit 22c5c81

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

nulldevice.c

+16-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,14 @@ class cNullOsdProvider : public cOsdProvider {
3434
virtual void DropImageData(int ImageHandle) {}
3535

3636
public:
37-
cNullOsdProvider() : cOsdProvider() {}
38-
virtual ~cNullOsdProvider() {}
37+
cNullOsdProvider() : cOsdProvider()
38+
{
39+
isyslog("dbus2vdr: Null-Osd-Provider created");
40+
}
41+
virtual ~cNullOsdProvider()
42+
{
43+
isyslog("dbus2vdr: Null-Osd-Provider destroyed");
44+
}
3945
};
4046

4147

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

4854
cNullPlayer::cNullPlayer(void)
4955
{
56+
isyslog("dbus2vdr: Null-Player created");
5057
}
5158

52-
cNullPlayer::~cNullPlayer()
59+
cNullPlayer::~cNullPlayer(void)
5360
{
5461
Detach();
62+
isyslog("dbus2vdr: Null-Player destroyed");
5563
}
5664

5765

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

69-
cNullPlayer *cNullControl::Player;
77+
cNullPlayer *cNullControl::Player = NULL;
7078

7179
cNullControl::cNullControl(void)
7280
:cControl(Player = new cNullPlayer)
7381
{
82+
isyslog("dbus2vdr: Null-Control created");
7483
}
7584

76-
cNullControl::~cNullControl()
85+
cNullControl::~cNullControl(void)
7786
{
7887
delete Player;
7988
Player = NULL;
89+
isyslog("dbus2vdr: Null-Control destroyed");
8090
}
8191

8292

@@ -85,7 +95,7 @@ void cNullDevice::MakePrimaryDevice(bool On)
8595
cDevice::MakePrimaryDevice(On);
8696
if (On) {
8797
new cNullOsdProvider();
88-
if (cNullControl::Player != NULL) {
98+
if (cNullControl::Player == NULL) {
8999
cControl::Launch(new cNullControl());
90100
cControl::Attach();
91101
}

0 commit comments

Comments
 (0)