[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/v0.8.2] src: Video4linux webcam,
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2011-11-09 2:02:51
Message-ID: 20111109020251.D6CF2A60BE () git ! kde ! org
[Download RAW message or body]

Git commit ff8f45d83f51c25f67ef555c81e9253fb2258b75 by Jean-Baptiste Mardelle.
Committed on 09/11/2011 at 02:53.
Pushed by mardelle into branch 'v0.8.2'.

Video4linux webcam, only show each format once in case the webcam answers same format \
several times

M  +3    -1    src/wizard.cpp

http://commits.kde.org/kdenlive/ff8f45d83f51c25f67ef555c81e9253fb2258b75

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 7a8c12e..7574901 100644
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -219,7 +219,9 @@ void Wizard::slotUpdateCaptureParameters()
             itemSize = sizes.at(j).section("=", 0, 0);
             itemRates = sizes.at(j).section("=", 1, 1).split(",", \
QString::SkipEmptyParts);  for (int k = 0; k < itemRates.count(); k++) {
-                m_capture.v4l_formats->addItem("[" + format + "] " + itemSize + " (" \
+ itemRates.at(k) + ")", QStringList() << format << itemSize.section('x', 0, 0) << \
itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << \
itemRates.at(k).section('/', 1, 1)); +                QString formatDescription = "[" \
+ format + "] " + itemSize + " (" + itemRates.at(k) + ")"; +                if \
(m_capture.v4l_formats->findText(formatDescription) == -1) +                    \
m_capture.v4l_formats->addItem(formatDescription, QStringList() << format << \
itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << \
itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1));  }
         }
     }


[prev in list] [next in list] [prev in thread] [next in thread]