summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_ht
diff options
context:
space:
mode:
Diffstat (limited to 'ftnoir_tracker_ht')
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp2
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h4
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.cpp (renamed from ftnoir_tracker_ht/video_widget.cpp)4
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.h (renamed from ftnoir_tracker_ht/video_widget.h)4
4 files changed, 7 insertions, 7 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 27817a0c..b4fd03f6 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -165,7 +165,7 @@ Tracker::~Tracker()
void Tracker::StartTracker(QFrame* videoframe)
{
videoframe->show();
- videoWidget = new VideoWidget(videoframe);
+ videoWidget = new HTVideoWidget(videoframe);
QHBoxLayout* layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(videoWidget);
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index 5b8eb508..96607411 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -12,7 +12,7 @@
#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
#include "headtracker-ftnoir.h"
#include "ui_ht-trackercontrols.h"
-#include "video_widget.h"
+#include "ht_video_widget.h"
#include "compat/compat.h"
#include <QObject>
#include <QTimer>
@@ -31,7 +31,7 @@ private:
QTimer timer;
PortableLockedShm lck_shm;
QProcess subprocess;
- VideoWidget* videoWidget;
+ HTVideoWidget* videoWidget;
QHBoxLayout* layout;
volatile bool fresh;
private slots:
diff --git a/ftnoir_tracker_ht/video_widget.cpp b/ftnoir_tracker_ht/ht_video_widget.cpp
index 84cba6a3..4d7d66a2 100644
--- a/ftnoir_tracker_ht/video_widget.cpp
+++ b/ftnoir_tracker_ht/ht_video_widget.cpp
@@ -5,13 +5,13 @@
* copyright notice and this permission notice appear in all copies.
*/
-#include "video_widget.h"
+#include "ht_video_widget.h"
#include <QDebug>
using namespace std;
-void VideoWidget::update_image(unsigned char *frame, int width, int height)
+void HTVideoWidget::update_image(unsigned char *frame, int width, int height)
{
QMutexLocker foo(&mtx);
QImage qframe = QImage(width, height, QImage::Format_RGB888);
diff --git a/ftnoir_tracker_ht/video_widget.h b/ftnoir_tracker_ht/ht_video_widget.h
index 87b6278a..b1182d8b 100644
--- a/ftnoir_tracker_ht/video_widget.h
+++ b/ftnoir_tracker_ht/ht_video_widget.h
@@ -17,12 +17,12 @@
#include <QPaintEvent>
// ----------------------------------------------------------------------------
-class VideoWidget : public QWidget
+class HTVideoWidget : public QWidget
{
Q_OBJECT
public:
- VideoWidget(QWidget *parent) : QWidget(parent), mtx() {
+ HTVideoWidget(QWidget *parent) : QWidget(parent), mtx() {
}
void update_image(unsigned char* frame, int width, int height);
protected slots: