New upstream version 3.1

[minitube] / src / videodefinition.h

diff --git a/src/videodefinition.h b/src/videodefinition.h
index 13001c1a818328bd3c97e4131aae6d16dd8071f4..b35a545cbfb2d1ca6d27dc1255ef8e6e50cbfd46 100644 (file)
--- a/src/videodefinition.h
+++ b/src/videodefinition.h
@@ -24,28 +24,29 @@ $END_LICENSE */
 #include <QtCore>
 
 class VideoDefinition {
-
 public:
-    static const QList<VideoDefinition>& getDefinitions();
-    static const VideoDefinition& getDefinitionFor(const QString& name);
-    static const VideoDefinition& getDefinitionFor(int code);
+    static const QVector<VideoDefinition> &getDefinitions();
+    static const QVector<QString> &getDefinitionNames();
+    static const VideoDefinition &forName(const QString &name);
+    static const VideoDefinition &forCode(int code);
 
-    VideoDefinition(const QString& name, int code);
-    VideoDefinition(const VideoDefinition& other);
+    VideoDefinition(const QString &name, int code, bool hasAudioStream = false);
 
-    const QString& getName() const { return m_name; }
-    int getCode() const { return m_code; }
+    const QString &getName() const { return name; }
+    int getCode() const { return code; }
+    bool hasAudio() const { return hasAudioStream; }
     bool isEmpty() const;
 
-private:
-    VideoDefinition& operator=(const VideoDefinition&);
+    VideoDefinition &operator=(const VideoDefinition &);
 
-    const QString m_name;
-    const int m_code;
+private:
+    const QString name;
+    const int code;
+    const bool hasAudioStream;
 };
 
-inline bool operator==(const VideoDefinition& lhs, const VideoDefinition& rhs) {
-    return lhs.getCode() == rhs.getCode() && lhs.getName() == rhs.getName();
+inline bool operator==(const VideoDefinition &lhs, const VideoDefinition &rhs) {
+    return lhs.getCode() == rhs.getCode();
 }
 
 #endif // VIDEODEFINITION_H