Oops actually fmt18 still works

diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index 8735f8aaae1ee59ca8f7c952c5bb0224551b0b2f..d8d67752c9a22b0f7c613cbf49d92c1f1de92424 100644 (file)
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -277,6 +277,7 @@ void MediaView::gotStreamUrl(QUrl streamUrl) {
     if (reallyStopped) return;
 
     // go!
+    qDebug() << "Playing" << streamUrl.toString();
     mediaObject->setCurrentSource(streamUrl);
     mediaObject->play();
 
@@ -299,7 +300,7 @@ void MediaView::itemActivated(const QModelIndex &index) {
 }
 
 void MediaView::currentSourceChanged(const Phonon::MediaSource source) {
-    qDebug() << "Playing" << source.url().toString();
+
 }
 
 void MediaView::skipVideo() {

diff --git a/src/video.cpp b/src/video.cpp
index 8aa21bf377ad775219dcf11f8ba123b3f4786b22..6e902485d811b0092c7151fd8d85b13b353237ff 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -122,9 +122,9 @@ void  Video::gotVideoInfo(QByteArray data) {
     QSettings settings;
     QString definitionName = settings.value("definition").toString();
     int definitionCode = VideoDefinition::getDefinitionCode(definitionName);
-    if (definitionCode == 34) {
+    if (definitionCode == 18) {
         // This is assumed always available
-        foundVideoUrl(videoToken, 34);
+        foundVideoUrl(videoToken, 18);
     } else {
         findVideoUrl(definitionCode);
     }
@@ -169,9 +169,9 @@ void Video::scrapeWebPage(QByteArray data) {
     QSettings settings;
     QString definitionName = settings.value("definition").toString();
     int definitionCode = VideoDefinition::getDefinitionCode(definitionName);
-    if (definitionCode == 34) {
+    if (definitionCode == 18) {
         // This is assumed always available
-        foundVideoUrl(videoToken, 34);
+        foundVideoUrl(videoToken, 18);
     } else {
         findVideoUrl(definitionCode);
     }
@@ -197,7 +197,7 @@ void Video::gotHeadHeaders(QNetworkReply* reply) {
             QString nextDefinitionName = definitionNames.at(previousIndex);
             findVideoUrl(nextDefinitionName);
         } else {
-            foundVideoUrl(videoToken, 34);
+            foundVideoUrl(videoToken, 18);
         }*/
 
 
@@ -207,15 +207,15 @@ void Video::gotHeadHeaders(QNetworkReply* reply) {
         if (currentIndex > 0) {
             previousIndex = currentIndex - 1;
             int definitionCode = definitionCodes.at(previousIndex);
-            if (definitionCode == 34) {
+            if (definitionCode == 18) {
                 // This is assumed always available
-                foundVideoUrl(videoToken, 34);
+                foundVideoUrl(videoToken, 18);
             } else {
                 findVideoUrl(definitionCode);
             }
 
         } else {
-            foundVideoUrl(videoToken, 34);
+            foundVideoUrl(videoToken, 18);
         }
 
     }

diff --git a/src/videodefinition.cpp b/src/videodefinition.cpp
index 842bf3c4536f077d1a4589592e556c5ada6dcc30..c2180e2d24b39f2cfc2136b30c3dea95541a054f 100644 (file)
--- a/src/videodefinition.cpp
+++ b/src/videodefinition.cpp
@@ -6,14 +6,14 @@ QStringList VideoDefinition::getDefinitionNames() {
 }
 
 QList<int> VideoDefinition::getDefinitionCodes() {
-    static QList<int> definitionCodes = QList<int>() << 34 << 22 << 37;
+    static QList<int> definitionCodes = QList<int>() << 18 << 22 << 37;
     return definitionCodes;
 }
 
 QHash<QString, int> VideoDefinition::getDefinitions() {
     static QHash<QString, int> definitions;
     if (definitions.isEmpty()) {
-        definitions.insert("360p", 34);
+        definitions.insert("360p", 18);
         definitions.insert("720p", 22);
         definitions.insert("1080p", 37);
     }