diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
| commit | 1248e901aaf4fdb720b3fa201574aa24df4d4524 (patch) | |
| tree | 7173b34e1f68a5338b8c0c1ad8c5d33a805bbdbf /ftnoir_tracker_ht/ht_video_widget.h | |
| parent | 65966c1497cbcf2c9556a754ab4e1ddef5957cfb (diff) | |
| parent | 9cc86cf3569ef6e68c4779ee0d96d1ae4ef77ca6 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_ht/ht_video_widget.h')
| -rw-r--r-- | ftnoir_tracker_ht/ht_video_widget.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ftnoir_tracker_ht/ht_video_widget.h b/ftnoir_tracker_ht/ht_video_widget.h index be4aee44..054b2cf4 100644 --- a/ftnoir_tracker_ht/ht_video_widget.h +++ b/ftnoir_tracker_ht/ht_video_widget.h @@ -1,27 +1,21 @@ -/* Copyright (c) 2012 Patrick Ruoff +/* Copyright (c) 2014 Stanislaw Halik * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. */ +#pragma once -#ifndef VIDEOWIDGET_H -#define VIDEOWIDGET_H - -#include <QTime> +#include <QTimer> #include <QWidget> #include <QMutex> #include <QMutexLocker> -#include <QLabel> #include <QPainter> #include <QPaintEvent> -#include <QTimer> -// ---------------------------------------------------------------------------- class HTVideoWidget : public QWidget { Q_OBJECT - public: HTVideoWidget(QWidget *parent) : QWidget(parent), fb(), width(0), height(0), fresh(false) { connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint())); @@ -35,7 +29,6 @@ protected slots: painter.drawImage(e->rect(), texture); } void update_and_repaint(); - private: QMutex mtx; QImage texture; @@ -44,5 +37,3 @@ private: int width,height; bool fresh; }; - -#endif // VIDEOWIDGET_H |