mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-05 10:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms"

Browse Source 
This reverts commit 48f79da892.
This commit is contained in:
Isaac Connor
2021-05-03 14:19:34 -04:00
parent bc6ba0a772
commit 80d2f9f098
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_monitor.cpp
View File

@@ -3030,6 +3030,8 @@ bool Monitor::DumpSettings(char *output, bool verbose) {
return true;
} // bool Monitor::DumpSettings(char *output, bool verbose)
unsigned int Monitor::Colours() const { return camera->Colours(); }
unsigned int Monitor::SubpixelOrder() const { return camera->SubpixelOrder(); }
int Monitor::PrimeCapture() {
int ret = camera->PrimeCapture();

4
src/zm_monitor.h
View File

@@ -499,8 +499,8 @@ public:
unsigned int Width() const { return width; }
unsigned int Height() const { return height; }
unsigned int Colours() const { return colours; }
unsigned int SubpixelOrder() const { return subpixelorder; };
unsigned int Colours() const;
unsigned int SubpixelOrder() const;
int GetAudioFrequency() const { return shared_data ? shared_data->audio_frequency : -1; }
int GetAudioChannels() const { return shared_data ? shared_data->audio_channels : -1; }