justindthomas
commented
5 years ago Okay, I got my hands a little dirty (it's been a long time since I've thought much in C++) and tracked down the updated constant names. Changing things in this way gets it to compile:
diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp
index 8892fcc21..b138dbfc6 100644
--- a/plugins/channeltx/modatv/atvmod.cpp
+++ b/plugins/channeltx/modatv/atvmod.cpp
@@ -346,7 +346,7 @@ void ATVMod::pullVideo(Real& sample)
mixImageAndText(colorFrame);
}
- cv::cvtColor(colorFrame, m_videoframeOriginal, CV_BGR2GRAY);
+ cv::cvtColor(colorFrame, m_videoframeOriginal, cv::COLOR_BGR2GRAY);
resizeVideo();
}
}
@@ -466,7 +466,7 @@ void ATVMod::pullVideo(Real& sample)
mixImageAndText(colorFrame);
}
- cv::cvtColor(colorFrame, camera.m_videoframeOriginal, CV_BGR2GRAY);
+ cv::cvtColor(colorFrame, camera.m_videoframeOriginal, cv::COLOR_BGR2GRAY);
resizeCamera();
}
@@ -576,7 +576,7 @@ bool ATVMod::handleMessage(const Message& cmd)
if (m_videoOK && m_video.isOpened())
{
- framesCount = m_video.get(CV_CAP_PROP_POS_FRAMES);;
+ framesCount = m_video.get(cv::CAP_PROP_POS_FRAMES);;
} else {
framesCount = 0;
}
@@ -807,7 +807,7 @@ void ATVMod::applyStandard()
void ATVMod::openImage(const QString& fileName)
{
- m_imageFromFile = cv::imread(qPrintable(fileName), CV_LOAD_IMAGE_GRAYSCALE);
+ m_imageFromFile = cv::imread(qPrintable(fileName), cv::ImreadModes::IMREAD_GRAYSCALE);
m_imageOK = m_imageFromFile.data != 0;
if (m_imageOK)
@@ -837,11 +837,11 @@ void ATVMod::openVideo(const QString& fileName)
if (m_videoOK)
{
m_settings.m_videoFileName = fileName;
- m_videoFPS = m_video.get(CV_CAP_PROP_FPS);
- m_videoWidth = (int) m_video.get(CV_CAP_PROP_FRAME_WIDTH);
- m_videoHeight = (int) m_video.get(CV_CAP_PROP_FRAME_HEIGHT);
- m_videoLength = (int) m_video.get(CV_CAP_PROP_FRAME_COUNT);
- int ex = static_cast<int>(m_video.get(CV_CAP_PROP_FOURCC));
+ m_videoFPS = m_video.get(cv::CAP_PROP_FPS);
+ m_videoWidth = (int) m_video.get(cv::CAP_PROP_FRAME_WIDTH);
+ m_videoHeight = (int) m_video.get(cv::CAP_PROP_FRAME_HEIGHT);
+ m_videoLength = (int) m_video.get(cv::CAP_PROP_FRAME_COUNT);
+ int ex = static_cast<int>(m_video.get(cv::CAP_PROP_FOURCC));
char ext[] = {(char)(ex & 0XFF),(char)((ex & 0XFF00) >> 8),(char)((ex & 0XFF0000) >> 16),(char)((ex & 0XFF000000) >> 24),0};
qDebug("ATVMod::openVideo: %s FPS: %f size: %d x %d #frames: %d codec: %s",
@@ -936,7 +936,7 @@ void ATVMod::seekVideoFileStream(int seekPercentage)
if ((m_videoOK) && m_video.isOpened())
{
int seekPoint = ((m_videoLength * seekPercentage) / 100);
- m_video.set(CV_CAP_PROP_POS_FRAMES, seekPoint);
+ m_video.set(cv::CAP_PROP_POS_FRAMES, seekPoint);
m_videoFPSCount = m_videoFPSq;
m_videoPrevFPSCount = 0;
m_videoEOF = false;
@@ -954,9 +954,9 @@ void ATVMod::scanCameras()
if (m_cameras.back().m_camera.isOpened())
{
- m_cameras.back().m_videoFPS = m_cameras.back().m_camera.get(CV_CAP_PROP_FPS);
- m_cameras.back().m_videoWidth = (int) m_cameras.back().m_camera.get(CV_CAP_PROP_FRAME_WIDTH);
- m_cameras.back().m_videoHeight = (int) m_cameras.back().m_camera.get(CV_CAP_PROP_FRAME_HEIGHT);
+ m_cameras.back().m_videoFPS = m_cameras.back().m_camera.get(cv::CAP_PROP_FPS);
+ m_cameras.back().m_videoWidth = (int) m_cameras.back().m_camera.get(cv::CAP_PROP_FRAME_WIDTH);
+ m_cameras.back().m_videoHeight = (int) m_cameras.back().m_camera.get(cv::CAP_PROP_FRAME_HEIGHT);
//m_cameras.back().m_videoFPS = m_cameras.back().m_videoFPS < 0 ? 16.3f : m_cameras.back().m_videoFPS;
@@ -1027,7 +1027,7 @@ void ATVMod::mixImageAndText(cv::Mat& image)
// position the text in the top left corner
cv::Point textOrg(6, textSize.height+10);
// then put the text itself
- cv::putText(image, m_settings.m_overlayText.toStdString(), textOrg, fontFace, fontScale, cv::Scalar::all(255*m_settings.m_uniformLevel), thickness, CV_AA);
+ cv::putText(image, m_settings.m_overlayText.toStdString(), textOrg, fontFace, fontScale, cv::Scalar::all(255*m_settings.m_uniformLevel), thickness, cv::LINE_AA);
}
void ATVMod::applyChannelSettings(int outputSampleRate, int inputFrequencyOffset, bool force)
f4exb
I'm using the instructions found here: https://github.com/f4exb/sdrangel/wiki/Compile-from-source-in-Linux to install SDRAngel on a Pine64+ board running Arch Linux (I intend to use just the server component with a LimeSDR Mini). It mostly compiles okay, but is getting stuck on the modatv plugin:
This is the cmake command I'm using:
I was initially building with
-DBUILD_GUI=OFFand without SoapySDR when I first hit the error, but have sort of been flailing, adding things in to try to get it to continue. I'm not having any luck.Any advice would be greatly appreciated.