~morphis/qtubuntu-camera/change-hybris-dependency

« back to all changes in this revision

Viewing changes to src/aalimagecapturecontrol.h

Committer: CI Train Bot
Date: 2015-12-10 15:29:37 UTC
mfrom: (153.1.2 qtubuntu-camera)
Revision ID: ci-train-bot@canonical.com-20151210152937-1fe6banpl9ju3yyw

Resync trunk.

files added:
.qmake.conf

files modified:
aalCamera.pro

debian/changelog

debian/control

src/aalcameracontrol.cpp

src/aalcameraflashcontrol.cpp

src/aalcameraflashcontrol.h

src/aalcamerafocuscontrol.cpp

src/aalcameraservice.cpp

src/aalcameraservice.h

src/aalcamerazoomcontrol.cpp

src/aalcamerazoomcontrol.h

src/aalimagecapturecontrol.cpp

src/aalimagecapturecontrol.h

src/aalimageencodercontrol.cpp

src/aalimageencodercontrol.h

src/aalvideodeviceselectorcontrol.cpp

src/aalvideoencodersettingscontrol.cpp

src/aalvideorenderercontrol.cpp

src/aalviewfindersettingscontrol.cpp

src/aalviewfindersettingscontrol.h

src/src.pro

unittests/aalcameracontrol/aalcameraservice.cpp

unittests/aalcameraexposurecontrol/aalcameraservice.cpp

unittests/aalcameraflashcontrol/aalcameraservice.cpp

unittests/aalcamerafocuscontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/tst_aalcamerazoomcontrol.cpp

unittests/aalimagecapturecontrol/aalcameraservice.cpp

unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp

unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp

unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp

unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp

unittests/aalviewfindersettingscontrol/aalcameraservice.cpp

unittests/mocks/aal/camera_compatibility_layer.cpp

unittests/mocks/aal/camera_compatibility_layer_capabilities.h

unittests/stubs/aalcameraservice_stub.cpp

Show diffs side-by-side

added added

removed removed

src/aalimagecapturecontrol.h

#define AALIMAGECAPTURECONTROL_H

#include <QCameraImageCaptureControl>

#include <QSettings>

#include <QString>

#include <QTemporaryFile>

#include <storagemanager.h>

bool isCaptureRunning() const;

/// Find the highest optimal aspect ratio resolution, which depends

/// on the type of camera currently selected:

float getAspectRatio() const;

public Q_SLOTS:

void init(CameraControl *control, CameraControlListener *listener);

void onPreviewReady();

void shutter();

private:

QSize chooseOptimalSize(const QList<QSize> &sizes, bool updateAspectRatio = true);

float getScreenAspectRatio();

void getPriorityAspectRatios();

void saveJpeg(void* data, uint32_t dataSize);

bool updateJpegMetadata(void* data, uint32_t dataSize, QTemporaryFile* destination);

StorageManager m_storageManager;

bool m_ready;

QString m_pendingCaptureFile;

int m_photoWidth;

int m_photoHeight;

float m_aspectRatio;

float m_screenAspectRatio;

/// Maintains a list of highest priority aspect ratio to lowest, for the

/// currently selected camera

QList<float> m_prioritizedAspectRatios;

QString m_galleryPath;

QMediaPlayer *m_audioPlayer;

QSettings m_settings;

};

#endif

Older »