From patchwork Thu Dec 4 23:27:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 27327 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwfnr-00020D-42; Fri, 05 Dec 2014 00:27:19 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1Xwfnp-0005p3-0w; Fri, 05 Dec 2014 00:27:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933245AbaLDX1M (ORCPT + 1 other); Thu, 4 Dec 2014 18:27:12 -0500 Received: from mout.gmx.net ([212.227.17.22]:59216 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933203AbaLDX1L (ORCPT ); Thu, 4 Dec 2014 18:27:11 -0500 Received: from linux.local ([94.216.58.185]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Lk81O-1XQ54R1C9q-00cCq6 for ; Fri, 05 Dec 2014 00:27:09 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH 2/3] qv4l2: fix qt5 compile Date: Fri, 5 Dec 2014 00:27:06 +0100 Message-Id: <1417735627-13945-2-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1417735627-13945-1-git-send-email-ps.report@gmx.net> References: <1417735627-13945-1-git-send-email-ps.report@gmx.net> X-Provags-ID: V03:K0:mAecQGHWnTFjMuqgueokTDrNhtRO+Hx0endI4QcWl3fJqZmhjcH ocpFqNyTNmPv7bauJyOZ9Yuy7PK+jhYSizBJ5Bx19SvzZlQlnc1scqGUkbXkTJauZbfHkrM roXC0VnlNx1dv/jXhYLGTYpwpkjmHrQCLZuzF7lAE0F7/1xtvuxrk/5yJK1vytQHR9TEwiJ YHnpWXi4Ox6yM1sKFZiBA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.12.4.231221 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Peter Seiderer --- utils/qv4l2/capture-win-qt.cpp | 4 ++++ utils/qv4l2/qv4l2.cpp | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/utils/qv4l2/capture-win-qt.cpp b/utils/qv4l2/capture-win-qt.cpp index db85cd2..9c849a0 100644 --- a/utils/qv4l2/capture-win-qt.cpp +++ b/utils/qv4l2/capture-win-qt.cpp @@ -117,7 +117,11 @@ void CaptureWinQt::paintFrame() void CaptureWinQt::stop() { if (m_data != NULL) +#if QT_VERSION >= 0x050000 + memcpy(m_image->bits(), m_data, m_image->byteCount()); +#else memcpy(m_image->bits(), m_data, m_image->numBytes()); +#endif m_data = NULL; } diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index 0784a15..8329cbd 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -1084,8 +1084,13 @@ void ApplicationWindow::startAudio() QString audOut = m_genTab->getAudioOutDevice(); if (audIn != NULL && audOut != NULL && audIn.compare("None") && audIn.compare(audOut) != 0) { +#if QT_VERSION >= 0x050000 + alsa_thread_startup(audOut.toLatin1().data(), audIn.toLatin1().data(), + m_genTab->getAudioDeviceBufferSize(), NULL, 0); +#else alsa_thread_startup(audOut.toAscii().data(), audIn.toAscii().data(), m_genTab->getAudioDeviceBufferSize(), NULL, 0); +#endif if (m_genTab->isRadio()) statusBar()->showMessage("Capturing audio"); @@ -1582,7 +1587,11 @@ void ApplicationWindow::error(const QString &error) { statusBar()->showMessage(error, 20000); if (!error.isEmpty()) +#if QT_VERSION >= 0x050000 + fprintf(stderr, "%s\n", error.toLatin1().data()); +#else fprintf(stderr, "%s\n", error.toAscii().data()); +#endif } void ApplicationWindow::error(int err) @@ -1657,7 +1666,11 @@ static bool processShortOption(const QStringList &args, int &i, QString &dev) return false; if (args[i].length() == 2) { if (i + 1 >= args.size()) { +#if QT_VERSION >= 0x050000 + usageError(args[i].toLatin1()); +#else usageError(args[i].toAscii()); +#endif return false; } dev = args[++i]; @@ -1680,7 +1693,11 @@ static bool processLongOption(const QStringList &args, int &i, QString &dev) return true; } if (i + 1 >= args.size()) { +#if QT_VERSION >= 0x050000 + usageError(args[i].toLatin1()); +#else usageError(args[i].toAscii()); +#endif return false; } dev = args[++i]; @@ -1734,7 +1751,11 @@ int main(int argc, char **argv) } else if (args[i] == "-R" || args[i] == "--raw") { raw = true; } else { +#if QT_VERSION >= 0x050000 + printf("Invalid argument %s\n", args[i].toLatin1().data()); +#else printf("Invalid argument %s\n", args[i].toAscii().data()); +#endif return 0; } }