From 50cbf532f28f9533e0e6fd6026a3d50d5471fe8b Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Wed, 29 Aug 2012 17:02:04 +0300 Subject: [PATCH] Get rid of main.cpp and main.h and build as a library --- lib/lib.pro | 7 +-- lib/main.cpp | 143 --------------------------------------------------- lib/main.h | 37 ------------- 3 files changed, 2 insertions(+), 185 deletions(-) delete mode 100644 lib/main.cpp delete mode 100644 lib/main.h diff --git a/lib/lib.pro b/lib/lib.pro index 0de447b..ea2340f 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -1,5 +1,5 @@ -TEMPLATE = app -TARGET = +TEMPLATE = lib +TARGET = qtcamera DEPENDPATH += . INCLUDEPATH += . @@ -28,6 +28,3 @@ isEqual(MEEGO_EDITION, harmattan) { SOURCES += qtcamviewfinderrenderermeego.cpp HEADERS += qtcamviewfinderrenderermeego.h } - -SOURCES += main.cpp -HEADERS += main.h diff --git a/lib/main.cpp b/lib/main.cpp deleted file mode 100644 index 69c63c7..0000000 --- a/lib/main.cpp +++ /dev/null @@ -1,143 +0,0 @@ -#include -#include -#include "qtcamera.h" -#include "qtcamdevice.h" -#include -#include -#include -#include -#include -#include -#include "main.h" -#include "qtcamgraphicsviewfinder.h" -#include -#include -#include -#include -#include -#include "qtcamimagemode.h" -#include "qtcamvideomode.h" -#include -#include "qtcammetadata.h" -#include - -Camera::Camera(QWidget *parent) : - QWidget(parent), - m_cam(new QtCamera("camera.ini")), - m_dev(0), m_vf(0) { - - setMinimumSize(700, 500); - - QGraphicsView *v = new QGraphicsView; - v->setViewport(new QGLWidget); - v->setMinimumSize(640, 480); - m_scene = new QGraphicsScene; - v->setScene(m_scene); - - // m_vf = new QtCamGraphicsViewfinder(m_cam->config()); - // m_vf->resize(640, 480); - // s->addItem(m_vf); - - QVBoxLayout *layout = new QVBoxLayout(this); - layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(v); - - QToolBar *tools = new QToolBar(this); - layout->addWidget(tools); - - QToolButton *devs = new QToolButton(this); - devs->setArrowType(Qt::DownArrow); - devs->setPopupMode(QToolButton::InstantPopup); - tools->addWidget(devs); - - QActionGroup *group = new QActionGroup(devs); - QObject::connect(group, SIGNAL(triggered(QAction *)), this, SLOT(setDevice(QAction *))); - - QList > devices = m_cam->devices(); - for (int x = 0; x < devices.size(); x++) { - QAction *a = group->addAction(devices[x].first); - a->setData(devices[x].second); - a->setCheckable(true); - devs->addAction(a); - } - - tools->addSeparator(); - tools->addAction(tr("Image"), this, SLOT(switchToImage())); - tools->addAction(tr("Video"), this, SLOT(switchToVideo())); - - QList actions = group->actions(); - if (!actions.isEmpty()) { - actions[0]->setChecked(true); - setDevice(actions[0]); - } - - m_button = new QPushButton(tr("Capture")); - tools->addWidget(m_button); - QObject::connect(m_button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - - m_meta = new QtCamMetaData(this); - m_meta->setDevice(m_dev); -} - -Camera::~Camera() { - if (m_dev) { - m_dev->stop(); - } -} - -void Camera::setDevice(QAction *action) { - QVariant id = action->data(); - - if (m_dev) { - m_dev->stop(); - delete m_dev; - delete m_vf; - } - - m_vf = new QtCamGraphicsViewfinder(m_cam->config()); - m_vf->resize(640, 480); - m_scene->addItem(m_vf); - m_vf->show(); - - m_dev = m_cam->device(id); - m_dev->setViewfinder(m_vf); - m_dev->start(); -} - -void Camera::switchToImage() { - m_dev->imageMode()->activate(); -} - -void Camera::switchToVideo() { - m_dev->videoMode()->activate(); -} - -void Camera::buttonClicked() { - if (m_dev->activeMode() == m_dev->imageMode()) { - m_meta->reset(); - m_meta->setArtist("Mohammed"); - m_meta->setDateTime(QDateTime::currentDateTime()); - m_dev->imageMode()->capture("/tmp/foo.jpg"); - } - else if (m_dev->activeMode() == m_dev->videoMode()) { - if (m_dev->videoMode()->isRecording()) { - m_dev->videoMode()->stopRecording(); - m_button->setText(tr("Capture")); - } - else { - m_meta->reset(); - m_meta->setArtist("Mohammed"); - m_meta->setDateTime(QDateTime::currentDateTime()); - m_dev->videoMode()->startRecording("/tmp/foo.ogg"); - m_button->setText(tr("Stop")); - } - } -} - -int main(int argc, char *argv[]) { - QApplication app(argc, argv); - Camera c; - c.show(); - - return app.exec(); -} diff --git a/lib/main.h b/lib/main.h deleted file mode 100644 index d8c7084..0000000 --- a/lib/main.h +++ /dev/null @@ -1,37 +0,0 @@ -// -*- c++ -*- - -#ifndef MAIN_H -#define MAIN_H - -#include - -class QtCamera; -class QtCamDevice; -class QtCamGraphicsViewfinder; -class QPushButton; -class QtCamMetaData; -class QGraphicsScene; - -class Camera : public QWidget { - Q_OBJECT - -public: - Camera(QWidget *parent = 0); - ~Camera(); - -private slots: - void setDevice(QAction *action); - void switchToImage(); - void switchToVideo(); - void buttonClicked(); - -private: - QGraphicsScene *m_scene; - QtCamera *m_cam; - QtCamDevice *m_dev; - QtCamGraphicsViewfinder *m_vf; - QPushButton *m_button; - QtCamMetaData *m_meta; -}; - -#endif /* MAIN_H */ -- 2.25.1