Skip to content

Commit 539df13

Browse files
committed
- Fixed Removed stale _logger object (#1863)
1 parent 58e86f1 commit 539df13

File tree

6 files changed

+3
-10
lines changed

6 files changed

+3
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6969
- Fixed that LED Buffer and Layout might get out of sync.
7070
- Fixed Screen capture error (#1824)
7171
- Fixed Provide custom forwarding targets is not possible (#1713)
72-
- Fixed Last update of an effect event is not removed in sources overview
72+
- Fixed Last update of an effect event is not removed in sources overview
73+
- Fixed Removed stale _logger object (#1863)
7374
- UI: Instance listings are sorted, enabled instances are high-lighted in drop-downs
7475

7576
**JSON-API**

include/grabber/qt/QtGrabber.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,4 @@ private slots:
123123

124124
QScreen* _screen;
125125
bool _isVirtual;
126-
127-
Logger * _logger;
128126
};

include/grabber/x11/X11Grabber.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,5 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
124124
bool _xRandRAvailable;
125125
bool _isWayland;
126126

127-
Logger * _logger;
128-
129127
Image<ColorRgb> _image;
130128
};

include/grabber/xcb/XcbGrabber.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ class XcbGrabber : public Grabber, public QAbstractNativeEventFilter
8484
bool _XcbShmPixmapAvailable;
8585
bool _isWayland;
8686

87-
Logger * _logger;
88-
8987
uint8_t * _shmData;
9088

9189
int _XcbRandREventBase;

libsrc/grabber/x11/X11Grabber.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ X11Grabber::X11Grabber(int cropLeft, int cropRight, int cropTop, int cropBottom)
2626
, _xRenderAvailable(false)
2727
, _xRandRAvailable(false)
2828
, _isWayland (false)
29-
, _logger{}
3029
{
3130
_useImageResampler = false;
3231
_imageResampler.setCropping(0, 0, 0, 0); // cropping is performed by XRender, XShmGetImage or XGetImage

libsrc/grabber/xcb/XcbGrabber.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ XcbGrabber::XcbGrabber(int cropLeft, int cropRight, int cropTop, int cropBottom)
3737
, _XcbShmAvailable{}
3838
, _XcbShmPixmapAvailable{}
3939
, _isWayland (false)
40-
, _logger{}
4140
, _shmData{}
4241
, _XcbRandREventBase{-1}
4342
{
@@ -195,7 +194,7 @@ bool XcbGrabber::open()
195194
int ret = xcb_connection_has_error(_connection);
196195
if (ret != 0)
197196
{
198-
Debug(_logger, "Cannot open display, error %d", ret);
197+
Debug(_log, "Cannot open display, error %d", ret);
199198
}
200199
else
201200
{

0 commit comments

Comments
 (0)