~jhodapp/qtubuntu-camera/media-hub-camera-integration

Viewing changes to src/aalmediarecordercontrol.h

Committer: Jim Hodapp
Date: 2014-07-31 16:44:03 UTC
Revision ID: jim.hodapp@canonical.com-20140731164403-abcg6cnvm7t6tqrx

Use QTEST_GUILESS_MAIN instead of QTEST_MAIN to avoid X11 dbus errors for the unittests. Also use deleteLater() for AudioCapture and QThread deletion in the destructor of AalMediaRecorderControl

files modified:
src/aalmediarecordercontrol.cpp

src/aalmediarecordercontrol.h

src/audiocapture.cpp

unittests/aalcameracontrol/tst_aalcameracontrol.cpp

unittests/aalcameraexposurecontrol/tst_aalcameraexposurecontrol.cpp

unittests/aalcameraflashcontrol/tst_aalcameraflashcontrol.cpp

unittests/aalcamerafocuscontrol/tst_aalcamerafocuscontrol.cpp

unittests/aalcamerazoomcontrol/tst_aalcamerazoomcontrol.cpp

unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp

unittests/aalmediarecordercontrol/tst_aalmediarecordercontrol.cpp

unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp

unittests/aalviewfindersettingscontrol/tst_aalviewfindersettingscontrol.cpp

unittests/storagemanager/tst_storagemanager.cpp

Show diffs side-by-side

added added

removed removed

src/aalmediarecordercontrol.h

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

MediaRecorderWrapper* mediaRecorder() const;

AudioCapture *audioCapture();

AudioCapture *audioCapture() const;

public Q_SLOTS:

virtual void setMuted(bool muted);

Older »