From patchwork Fri Dec 5 20:17:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 5445781 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 46C449F1C5 for ; Fri, 5 Dec 2014 20:17:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5775A201C7 for ; Fri, 5 Dec 2014 20:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88B3420211 for ; Fri, 5 Dec 2014 20:17:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751587AbaLEURb (ORCPT ); Fri, 5 Dec 2014 15:17:31 -0500 Received: from mout.gmx.net ([212.227.17.22]:60536 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbaLEUR3 (ORCPT ); Fri, 5 Dec 2014 15:17:29 -0500 Received: from linux.local ([94.216.58.185]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0MZU7V-1YIFC72L8P-00LEiu for ; Fri, 05 Dec 2014 21:17:26 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v2 2/3] qv4l2: fix qt5 compile Date: Fri, 5 Dec 2014 21:17:24 +0100 Message-Id: <1417810645-21753-2-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1417810645-21753-1-git-send-email-ps.report@gmx.net> References: <1417810645-21753-1-git-send-email-ps.report@gmx.net> X-Provags-ID: V03:K0:i7T+pgDwq8Vj+hzaac24+DyDM1g0Wlqqt1kBLwXaOdYtF7J1WJK DHI1ankcXaRYLzVJWn580Uc1bcoSVB/rFCyPd55zVlHl/4a3ZJVLUs3ipeuG/UovWvftoWF AbGR5pAO3Iy2EbZRESkIS6Zr/P9u9f3Jmz9UNXRsykCZuCpGjfmCfmS95vPSoG0Omc0Suj0 R1eTCPPj3rU2VU8PmoMPA== 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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; } }