diff -Nru smtube-2.0/Changelog smtube-2.1/Changelog --- smtube-2.0/Changelog 2014-03-13 22:25:13.000000000 +0000 +++ smtube-2.1/Changelog 2014-03-25 22:03:08.000000000 +0000 @@ -1,3 +1,15 @@ +Version 2.1: + +(2014-03-25) + * When saving DASH 1080, be sure the video and audio files + have the same name. + * Disable the retry option for DASH streams since that option + doesn't work well yet. + +(2014-03-24) + * Increase speed when downloading DASH streams. + + Version 2.0: (2014-03-10) diff -Nru smtube-2.0/create_deb.sh smtube-2.1/create_deb.sh --- smtube-2.0/create_deb.sh 2014-03-13 22:30:00.000000000 +0000 +++ smtube-2.1/create_deb.sh 2014-03-25 22:07:22.000000000 +0000 @@ -4,7 +4,7 @@ cp debian-rvm/changelog-orig debian-rvm/changelog ./get_svn_revision.sh -#dch -v 2.0-`cat svn_revision` "New version" +#dch -v 2.1-`cat svn_revision` "New version" #dpkg-buildpackage -rfakeroot diff -Nru smtube-2.0/debian/changelog smtube-2.1/debian/changelog --- smtube-2.0/debian/changelog 2014-03-14 02:23:03.000000000 +0000 +++ smtube-2.1/debian/changelog 2014-03-25 22:38:03.000000000 +0000 @@ -1,4 +1,10 @@ -smtube (2.0-2~quantal1) quantal; urgency=low +smtube (2.1-1~quantal1) quantal; urgency=low + + * Improve the download speed for DASH formats. + + -- Ricardo Villalba Tue, 25 Mar 2014 23:03:47 +0100 + +smtube (2.0) precise; urgency=low * New option to record audio. * Download 1080p in DASH format. diff -Nru smtube-2.0/debian/patches/series smtube-2.1/debian/patches/series --- smtube-2.0/debian/patches/series 2014-03-14 02:15:49.000000000 +0000 +++ smtube-2.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -smtube_es diff -Nru smtube-2.0/debian/patches/smtube_es smtube-2.1/debian/patches/smtube_es --- smtube-2.0/debian/patches/smtube_es 2014-03-14 02:18:06.000000000 +0000 +++ smtube-2.1/debian/patches/smtube_es 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Fix Spanish translation -Fix Spanish translation -Author: Ricardo Villalba - ---- smtube-2.0.orig/src/translations/smtube_es.ts -+++ smtube-2.0/src/translations/smtube_es.ts -@@ -250,7 +250,7 @@ - - - Albanian -- Albano -+ Albanés - - - diff -Nru smtube-2.0/debian-rvm/changelog-orig smtube-2.1/debian-rvm/changelog-orig --- smtube-2.0/debian-rvm/changelog-orig 2014-03-13 22:25:13.000000000 +0000 +++ smtube-2.1/debian-rvm/changelog-orig 2014-03-25 22:07:22.000000000 +0000 @@ -1,3 +1,9 @@ +smtube (2.1) precise; urgency=low + + * Improve the download speed for DASH formats. + + -- Ricardo Villalba Tue, 25 Mar 2014 23:03:47 +0100 + smtube (2.0) precise; urgency=low * New option to record audio. diff -Nru smtube-2.0/Release_notes.txt smtube-2.1/Release_notes.txt --- smtube-2.0/Release_notes.txt 2014-03-13 22:25:13.000000000 +0000 +++ smtube-2.1/Release_notes.txt 2014-03-25 22:03:08.000000000 +0000 @@ -1,3 +1,8 @@ +Version 2.1 + + * Improve the download speed for DASH formats. + + Version 2.0 * New option to record audio. diff -Nru smtube-2.0/src/downloadfile.cpp smtube-2.1/src/downloadfile.cpp --- smtube-2.0/src/downloadfile.cpp 2014-01-25 21:51:21.000000000 +0000 +++ smtube-2.1/src/downloadfile.cpp 2014-03-25 21:55:54.000000000 +0000 @@ -209,10 +209,6 @@ file->close(); emit errorOcurred((int)error); } - /* - else - qDebug() << "Hello Darling"; - */ } #include "moc_downloadfile.cpp" diff -Nru smtube-2.0/src/main.cpp smtube-2.1/src/main.cpp --- smtube-2.0/src/main.cpp 2014-01-25 21:51:21.000000000 +0000 +++ smtube-2.1/src/main.cpp 2014-03-23 10:32:20.000000000 +0000 @@ -144,7 +144,7 @@ YTDialog * yt = new YTDialog(0, &settings); #ifdef YT_USE_SCRIPT - QString ytcode_name = "ytcode.script"; + QString ytcode_name = "yt.js"; QString ytcode_file = configPath() +"/"+ ytcode_name; if (QFile::exists(smplayerConfigPath())) ytcode_file = smplayerConfigPath() +"/"+ ytcode_name; qDebug("ytcode_file: %s", ytcode_file.toUtf8().constData()); diff -Nru smtube-2.0/src/recordingdialog.cpp smtube-2.1/src/recordingdialog.cpp --- smtube-2.0/src/recordingdialog.cpp 2014-03-12 22:35:50.000000000 +0000 +++ smtube-2.1/src/recordingdialog.cpp 2014-03-25 21:57:00.000000000 +0000 @@ -56,7 +56,7 @@ QPixmap retryPix(":/Control/bt-download-retry.png"); playIcon = getIcon(playPix); cancelIcon = getIcon(cancelPix); - retryIcon = getIcon(retryPix); + retryIcon = getIcon(retryPix); } void RecordingDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const @@ -105,7 +105,7 @@ painter->drawText(QRect(13, optionProgress.rect.bottom() + 3, rect.width(), rect.height()), Qt::AlignLeft | Qt::AlignTop, dd->downloadProgress); } else if(dd->downloadState == DownloadData::Canceled || dd->downloadState == DownloadData::Error) - { + { QDateTime time = dd->completionTime; QString currentDateString; if(time.date() == QDate::currentDate()) @@ -122,7 +122,7 @@ headerTextRect.height()), Qt::AlignVCenter | Qt::AlignRight, currentDateString ); painter->drawText(QRect(headerTextRect.left(), headerTextRect.bottom() + 5, rect.width(), rect.height()), Qt::AlignLeft | Qt::AlignTop, dd->downloadState == DownloadData::Canceled ? tr("Canceled") : tr("Error")); - currentPix = retryIcon.pixmap(dd->buttonState, MyIcon::Off ); + currentPix = retryIcon.pixmap(dd->retry_possible ? dd->buttonState : MyIcon::Disabled, MyIcon::Off ); QRect buttonRect(rect.width() - 13 - currentPix.width(), headerTextRect.bottom() + 5, currentPix.width(), currentPix.height()); if(dd->buttonRect != buttonRect) dd->buttonRect = buttonRect; painter->drawPixmap(buttonRect, currentPix); @@ -186,7 +186,7 @@ return icon; } -QSize RecordingDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const +QSize RecordingDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex &index) const { DownloadData* dd = index.data(RecordingDialog::DownloadDataRole).value(); if(dd->downloadState == DownloadData::Progressing) @@ -286,11 +286,36 @@ QString video_url = map.value(RetrieveYoutubeUrl::DASH_VIDEO_1080p, QString()); QString audio_url = RetrieveYoutubeUrl::findBestAudio(map); if (!video_url.isEmpty() && !audio_url.isEmpty()) { + video_url += "&ratebypass=yes"; + audio_url += "&ratebypass=yes"; + //qDebug("RecordingDialog::recordVideo: video_url: %s", video_url.toLatin1().constData()); //qDebug("RecordingDialog::recordVideo: audio_url: %s", audio_url.toLatin1().constData()); + qDebug("RecordingDialog::recordVideo: video and audio for 1080p DASH format found"); - download(audio_url, title, id, 0); - download(video_url, title, id, 0); + QString video_name = getUniqueFileName(title +".mp4"); + qDebug("RecordingDialog::recordVideo: video name '%s'", video_name.toUtf8().constData()); + + QString audio_extension = ".m4a"; + QRegExp rx("itag=(\\d+)"); + if (rx.indexIn(audio_url) != -1) { + int itag = rx.cap(1).toInt(); + //qDebug("itag: %d", itag); + if ((itag == RetrieveYoutubeUrl::DASH_AUDIO_WEBM_128) || (itag == RetrieveYoutubeUrl::DASH_AUDIO_WEBM_192)) { + audio_extension = ".webm"; + } + } + + QFileInfo fi(video_name); + QString audio_name = fi.absolutePath() +"/"+ fi.completeBaseName() + audio_extension; + qDebug("RecordingDialog::recordVideo: audio name '%s'", audio_name.toUtf8().constData()); + + if (QFile::exists(audio_name)) { + qDebug("RecordingDialog::recordVideo: the audio file already exists. Skipping."); + } else { + download(audio_url, title, id, 0, audio_name, false); + } + download(video_url, title, id, 0, video_name, false); return; } } @@ -308,16 +333,17 @@ qDebug("RecordingDialog::recordAudio"); QString url = RetrieveYoutubeUrl::findBestAudio(map); + url += "&ratebypass=yes"; if (url.isEmpty()) { QMessageBox::warning(0, tr("Recording failed"), tr("There was an error in retrieving the download URL.")); return; } - download(url, title, id, 0); + download(url, title, id, 0, QString::null, false); } -void RecordingDialog::download(QString url, QString title, QString id, double duration) +void RecordingDialog::download(QString url, QString title, QString id, double duration, const QString & saveas, bool retry_possible) { QUrl qurl(url); QListWidgetItem* item = new QListWidgetItem(0, QListWidgetItem::UserType + 1); @@ -357,18 +383,24 @@ break; } - QFile* file = new QFile(getUniqueFileName(title + ext)); + QString output_filename = saveas; + if (output_filename.isEmpty()) { + output_filename = getUniqueFileName(title + ext); + } + + QFile* file = new QFile(output_filename); dd->title = QFileInfo(*file).fileName(); dd->filePath = QFileInfo(*file).absoluteFilePath(); dd->videoDuration = (int)duration; dd->downloadProgress = tr("Starting"); dd->completionTime = QDateTime::currentDateTime(); + dd->retry_possible = retry_possible; item->setData(DownloadDataRole, QVariant::fromValue(dd)); item->setData(emitDataChangedRole, true); DownloadFile* dfile = new DownloadFile(url, file, this); - file->setParent(dfile); - itemDownloadMap[dfile] = item; + file->setParent(dfile); + itemDownloadMap[dfile] = item; connect(dfile, SIGNAL(downloadFinished(bool)), this, SLOT(oneDownloadFinished(bool))); connect(dfile, SIGNAL(downloadStatus(QString)), this, SLOT(oneDownloadProgressStatus(QString))); connect(dfile, SIGNAL(progress(int, qint64)), this, SLOT(oneDownloadProgress(int, qint64))); @@ -489,7 +521,7 @@ updateWindowTitle(); } -void RecordingDialog::resizeEvent(QResizeEvent *r) +void RecordingDialog::resizeEvent(QResizeEvent * /*r*/) { static_cast(downloadList->itemDelegate())->setWidth( downloadList->viewport()->width()); } @@ -582,7 +614,9 @@ } else if(dd->downloadState == DownloadData::Canceled || dd->downloadState == DownloadData::Error ) { - contextMenu.addAction(tr("&Retry"))->setData("retry"); + QAction *retryAct = contextMenu.addAction(tr("&Retry")); + retryAct->setData("retry"); + if (!dd->retry_possible) retryAct->setEnabled(false); contextMenu.addSeparator(); contextMenu.addAction(tr("Remove from &list"))->setData("remove"); QAction* action = contextMenu.exec(m->globalPos()); @@ -683,6 +717,9 @@ void RecordingDialog::retryDownload(QListWidgetItem *item) { DownloadData* dd = item->data(DownloadDataRole).value(); + + if (!dd->retry_possible) return; + dd->downloadState = DownloadData::Progressing; dd->downloadProgress = tr("Fetching URL..."); dd->downloadProgressPercent = 0; @@ -779,7 +816,7 @@ ++i ; } else - { + { delete model->index(i, 0).data(DownloadDataRole).value(); model->removeRow(i); } @@ -848,6 +885,7 @@ ddMap["videoid"] = dd->videoId; ddMap["video_duration"] = dd->videoDuration; ddMap["title"] = dd->title; + ddMap["retry_possible"] = dd->retry_possible; } itemList.append(ddMap); } @@ -882,6 +920,7 @@ dd->videoDuration = ddMap.value("video_duration").toInt(); dd->completionTime = ddMap.value("time").toDateTime(); dd->fileSize = ddMap.value("size").toLongLong(); + dd->retry_possible = ddMap.value("retry_possible").toBool(); item->setData(DownloadDataRole, QVariant::fromValue(dd)); item->setData(emitDataChangedRole, true); } diff -Nru smtube-2.0/src/recordingdialog.h smtube-2.1/src/recordingdialog.h --- smtube-2.0/src/recordingdialog.h 2014-03-11 01:14:19.000000000 +0000 +++ smtube-2.1/src/recordingdialog.h 2014-03-25 02:04:15.000000000 +0000 @@ -64,8 +64,7 @@ QString title; QRect buttonRect; QString filePath; - - + bool retry_possible; }; Q_DECLARE_METATYPE(DownloadData*) @@ -104,7 +103,7 @@ void downloadVideoId(QString videoId, QString title, double duration = 0); void downloadAudioId(QString videoId, QString title, double duration = 0); - void download(QString url, QString title, QString id, double duration); + void download(QString url, QString title, QString id, double duration, const QString & saveas = QString::null, bool retry_possible = true); QString getUniqueFileName(QString name); bool eventFilter(QObject *watched, QEvent *event); diff -Nru smtube-2.0/src/smtube.rc smtube-2.1/src/smtube.rc --- smtube-2.0/src/smtube.rc 2014-03-13 22:25:13.000000000 +0000 +++ smtube-2.1/src/smtube.rc 2014-03-25 22:07:22.000000000 +0000 @@ -1,7 +1,7 @@ #include -#define SMTUBE_FILEVERSION 2,0,0,0 -#define SMTUBE_PRODVERSION "2.0.0.0\0" +#define SMTUBE_FILEVERSION 2,1,0,0 +#define SMTUBE_PRODVERSION "2.1.0.0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION SMTUBE_FILEVERSION diff -Nru smtube-2.0/src/translations/smtube_bg.ts smtube-2.1/src/translations/smtube_bg.ts --- smtube-2.0/src/translations/smtube_bg.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_bg.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Британски английски Albanian - + Албански @@ -564,10 +562,7 @@ %1% of %n video - Recordings - - %1% от %n видеота - Записан - %1% от %n видеа - Записани - + %1% от %n видеота - Записан%1% от %n видеа - Записани @@ -972,4 +967,4 @@ Грешка - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_el.ts smtube-2.1/src/translations/smtube_el.ts --- smtube-2.0/src/translations/smtube_el.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_el.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -253,7 +251,7 @@ N'ko - + @@ -278,12 +276,12 @@ British English - + Βρετανικά Αγγλικά Albanian - + Αλβανικά @@ -536,7 +534,7 @@ There was an error in retrieving the download URL. - Παρουσιάστηκε ένα σφάλμα κατά την ανάκτηση του URL λήψης. + Παρουσιάστηκε σφάλμα κατά την ανάκτηση του συνδέσμου λήψης. @@ -564,10 +562,7 @@ %1% of %n video - Recordings - - %1% από %n βίντεο - Λήψεις - %1% από %n βίντεο - Λήψεις - + %1% από %n βίντεο - Λήψεις%1% από %n βίντεο - Λήψεις @@ -621,192 +616,192 @@ Argentina - + Αργεντινή Australia - + Αυστραλία Belgium - + Βέλγιο Brazil - + Βραζιλία Canada - + Καναδάς Chile - + Χιλή Colombia - + Κολομβία Czech Republic - + Τσεχία Egypt - + Αίγυπτος France - + Γαλλία Germany - + Γερμανία Great Britain - + Μεγάλη Βρετανία Hong Kong - + Χονγκ Κονγκ Hungary - + Ουγγαρία India - + Ινδία Ireland - + Ιρλανδία Israel - + Ισραήλ Italy - + Ιταλία Japan - + Ιαπωνία Jordan - + Ιορδανία Malaysia - + Μαλαισία Mexico - + Μεξικό Morocco - + Μαρόκο Netherlands - + Κάτω Χώρες New Zealand - + Νέα Ζηλανδία Peru - + Περού Philippines - + Φιλιππίνες Poland - + Πολωνία Russia - + Ρωσία Saudi Arabia - + Σαουδική Αραβία Singapore - + Σιγκαπούρη South Africa - + Νότια Αφρική South Korea - + Νότια Κορέα Spain - + Ισπανία Sweden - + Σουηδία Taiwan - + Ταϊβαν United Arab Emirates - + Ηνωμένα Αραβικά Εμιράτα United States - + Ηνωμένες Πολιτείες @@ -842,7 +837,7 @@ Most Relevant - Πιο Συναφή + Πιο Σχετικά @@ -872,7 +867,7 @@ R&ecord audio - + Λήψη ή&χου @@ -972,4 +967,4 @@ Σφάλμα - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_es.ts smtube-2.1/src/translations/smtube_es.ts --- smtube-2.0/src/translations/smtube_es.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_es.ts 2014-03-14 02:06:29.000000000 +0000 @@ -250,7 +250,7 @@ Albanian - Albano + Albanés diff -Nru smtube-2.0/src/translations/smtube_fr.ts smtube-2.1/src/translations/smtube_fr.ts --- smtube-2.0/src/translations/smtube_fr.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_fr.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Anglais Britannique Albanian - + Albanais @@ -564,10 +562,7 @@ %1% of %n video - Recordings - - %1% de %n vidéo(s) - Enregistrements - %1% de %n vidéo(s) - Enregistrements - + %1% de %n vidéo(s) - Enregistrements%1% de %n vidéo(s) - Enregistrements @@ -972,4 +967,4 @@ Erreur - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_hr.ts smtube-2.1/src/translations/smtube_hr.ts --- smtube-2.0/src/translations/smtube_hr.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_hr.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Britanski engleski Albanian - + Albanski @@ -564,11 +562,7 @@ %1% of %n video - Recordings - - %1% od %n video snimke - Snimanja - %1% od %n video snimke - Snimanja - %1% od %n video snimaka - Snimanja - + %1% od %n video snimke - Snimanja%1% od %n video snimke - Snimanja%1% od %n video snimaka - Snimanja @@ -873,7 +867,7 @@ R&ecord audio - + S&nimi zvuk @@ -973,4 +967,4 @@ Greška - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_hu.ts smtube-2.1/src/translations/smtube_hu.ts --- smtube-2.0/src/translations/smtube_hu.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_hu.ts 2014-03-25 00:44:32.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -123,7 +121,7 @@ Many people contributed with translations. - + Sokan hozzájárultak a fordításhoz. @@ -133,12 +131,12 @@ Visit %1 and join a translation team. - Látogasd meg a %1 hogy csatlakozz egy fordítói csapathoz. + Látogasd meg a %1 címet és csatlakozz valamelyik fordítói csapathoz. Current translators from the transifex teams: - Jelenlegi fordítók a Transifex csapatokból: + A Transifex csapatok jelenlegi fordítói: @@ -273,17 +271,17 @@ Slovak - + Szlovák British English - + Brit Angol Albanian - + Albánia @@ -321,23 +319,23 @@ Success - + Sikerült Error - Hiba + Hiba An error happened writing %1 - + Hiba történt írás közben: %1 An error happened while downloading the file:<br>%1 - + Hiba történt a fájl letöltése közben:<br>%1 @@ -365,7 +363,7 @@ Standard Feeds - + Szűrők @@ -375,7 +373,7 @@ Period of &time: - + I&dőszak: @@ -395,7 +393,7 @@ All time - + Mindenkor @@ -564,9 +562,7 @@ %1% of %n video - Recordings - - %n videó %1%-a - Felvételek - + %n videó %1%-a - Felvételek%n videók %1%-a - Felvételek @@ -620,192 +616,192 @@ Argentina - + Argentína Australia - + Ausztrália Belgium - + Belgium Brazil - + Brazília Canada - + Kanada Chile - + Chile Colombia - + Kolumbia Czech Republic - + Csehország Egypt - + Egyiptom France - + Franciaország Germany - + Németország Great Britain - + Nagy-Britannia Hong Kong - + Hong Kong Hungary - + Magyarország India - + India Ireland - + Írország Israel - + Izrael Italy - + Olaszország Japan - + Japán Jordan - + Jordánia Malaysia - + Malajzia Mexico - + Mexikó Morocco - + Marokkó Netherlands - + Hollandia New Zealand - + Új-Zéland Peru - + Peru Philippines - + Fülöp-szigetek Poland - + Lengyelország Russia - + Oroszország Saudi Arabia - + Szaúd-Arábia Singapore - + Szingapúr South Africa - + Dél-Afrika South Korea - + Dél-Korea Spain - + Spanyolország Sweden - + Svédország Taiwan - + Tajvan United Arab Emirates - + Egyesült Arab Emírségek United States - + Egyesült Államok @@ -871,7 +867,7 @@ R&ecord audio - + &Hang rögzítése @@ -882,23 +878,23 @@ Problems with Youtube - + Problémák a Youtube-bal Do you want to update the Youtube code? This may fix the problem. - + Szeretné frissíteni a Youtube kódot? Ez megoldja a problémát. Unfortunately due to changes in Youtube, the video '%1' can't be played or recorded. - + Sajnos a Youtube-on történt változások miatt, a(z) '%1' videót nem lehet lejátszani vagy rögzíteni. Maybe updating this application could fix the problem. - + Lehet, hogy az alkalmazás frissítése megoldja a problémát. @@ -971,4 +967,4 @@ Hiba - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_ja.ts smtube-2.1/src/translations/smtube_ja.ts --- smtube-2.0/src/translations/smtube_ja.ts 2014-03-13 21:47:12.000000000 +0000 +++ smtube-2.1/src/translations/smtube_ja.ts 2014-03-23 01:33:34.000000000 +0000 @@ -867,7 +867,7 @@ R&ecord audio - オーディオの録音(&E) + オーディオを録音(&E) diff -Nru smtube-2.0/src/translations/smtube_lt.ts smtube-2.1/src/translations/smtube_lt.ts --- smtube-2.0/src/translations/smtube_lt.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_lt.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Anglų (Britiška) Albanian - + Albanų @@ -564,11 +562,7 @@ %1% of %n video - Recordings - - %1% iš %n video - Įrašai - %1% iš %n video - Įrašai - %1% iš %n video - Įrašai - + %1% iš %n video - Įrašai%1% iš %n video - Įrašai%1% iš %n video - Įrašai @@ -973,4 +967,4 @@ Klaida - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_pt.ts smtube-2.1/src/translations/smtube_pt.ts --- smtube-2.0/src/translations/smtube_pt.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_pt.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Inglês britânico Albanian - + Albanês @@ -564,10 +562,7 @@ %1% of %n video - Recordings - - %1% de %n vídeo - Gravações - %1% de %n vídeos - Gravações - + %1% de %n vídeo - Gravações%1% de %n vídeos - Gravações @@ -972,4 +967,4 @@ Erro - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_sr.ts smtube-2.1/src/translations/smtube_sr.ts --- smtube-2.0/src/translations/smtube_sr.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_sr.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Британски енглески Albanian - + Албански @@ -564,11 +562,7 @@ %1% of %n video - Recordings - - %1% од %n видео снимка - Снимања - %1% од %n видео снимка - Снимања - %1% од %n видео снимака - Снимања - + %1% од %n видео снимка - Снимања%1% од %n видео снимка - Снимања%1% од %n видео снимака - Снимања @@ -973,4 +967,4 @@ Грешка - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_uk.ts smtube-2.1/src/translations/smtube_uk.ts --- smtube-2.0/src/translations/smtube_uk.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_uk.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -278,12 +276,12 @@ British English - + Британська Англійська Albanian - + Албанська @@ -564,11 +562,7 @@ %1% of %n video - Recordings - - %1% з %n відео - Запис - %1% з %n відео - Записи - %1% з %n відео - Запису - + %1% з %n відео - Запис%1% з %n відео - Записи%1% з %n відео - Запису @@ -622,192 +616,192 @@ Argentina - + Аргентина Australia - + Австралія Belgium - + Бельгія Brazil - + Бразилія Canada - + Канада Chile - + Чилі Colombia - + Колумбія Czech Republic - + Чеська республіка Egypt - + Єгипет France - + Франція Germany - + Німеччина Great Britain - + Велика Британія Hong Kong - + Гонконґ Hungary - + Угорщина India - + Індія Ireland - + Ірландія Israel - + Ізраїль Italy - + Італія Japan - + Японія Jordan - + Йорданія Malaysia - + Малайзія Mexico - + Мексика Morocco - + Марокко Netherlands - + Нідерланди New Zealand - + Нова Зеландія Peru - + Перу Philippines - + Філіппіни Poland - + Польща Russia - + росія Saudi Arabia - + Саудівська Аравія Singapore - + Сінгапур South Africa - + ПАР South Korea - + Південна Корея Spain - + Іспанія Sweden - + Швеція Taiwan - + Тайвань United Arab Emirates - + Об'єднані Арабські Емірати United States - + Сполучені Штати @@ -873,7 +867,7 @@ R&ecord audio - + Запи&с звуку @@ -973,4 +967,4 @@ Помилка - + \ No newline at end of file diff -Nru smtube-2.0/src/translations/smtube_zh_CN.ts smtube-2.1/src/translations/smtube_zh_CN.ts --- smtube-2.0/src/translations/smtube_zh_CN.ts 2014-03-13 01:02:01.000000000 +0000 +++ smtube-2.1/src/translations/smtube_zh_CN.ts 2014-03-23 01:33:34.000000000 +0000 @@ -1,6 +1,4 @@ - - - + About @@ -18,7 +16,7 @@ icon - icon + 图标 @@ -108,7 +106,7 @@ Ukrainian - Ukrainian + 乌克兰语 @@ -143,7 +141,7 @@ Korean - Korean + 韩语 @@ -153,7 +151,7 @@ Portuguese - Brazil - Portuguese - Brazil + 葡萄牙语 - 巴西 @@ -163,17 +161,17 @@ French - French + 法语 Danish - Danish + 丹麦语 German - German + 德语 @@ -198,7 +196,7 @@ Arabic - Arabic + 阿拉伯语 @@ -208,47 +206,47 @@ Serbian - Serbian + 塞尔维亚语 Croatian - Croatian + 克罗地亚语 Bulgarian - Bulgarian + 保加利亚语 Vietnamese - Vietnamese + 越南语 Indonesian - Indonesian + 印度尼西亚语 Arabic - Saudi Arabia - Arabic - Saudi Arabia + 阿拉伯语 - 沙特阿拉伯 Sinhala - Sinhala + 僧伽罗语 Greek - Greek + 希腊语 Estonian - Estonian + 爱沙尼亚语 @@ -258,17 +256,17 @@ Italian - Italian + 意大利语 Uzbek - Uzbek + 乌兹别克语 Catalan - Catalan + 加泰罗尼亚语 @@ -278,12 +276,12 @@ British English - + 英国英语 Albanian - + 阿尔巴尼亚语 @@ -355,7 +353,7 @@ &Save to this folder - 保存到文件夹(&S) + 保存到此文件夹(&S) @@ -523,7 +521,7 @@ &Clear list - 清除列表(&C) + 清空列表(&C) @@ -564,9 +562,7 @@ %1% of %n video - Recordings - - %1% / %n个视频 - 正在录制 - + %1% / %n个视频 - 正在录制 @@ -602,7 +598,7 @@ Fetching URL... - 正在读取 URL... + 正在提取 URL... @@ -620,62 +616,62 @@ Argentina - Argentina + 阿根廷 Australia - Australia + 澳大利亚 Belgium - Belgium + 比利时 Brazil - Brazil + 巴西 Canada - Canada + 加拿大 Chile - Chile + 智利 Colombia - Colombia + 哥伦比亚 Czech Republic - Czech Republic + 捷克共和国 Egypt - Egypt + 埃及 France - France + 法国 Germany - Germany + 德国 Great Britain - Great Britain + 英国 @@ -685,87 +681,87 @@ Hungary - Hungary + 匈牙利 India - India + 印度 Ireland - Ireland + 爱尔兰 Israel - Israel + 以色列 Italy - Italy + 意大利 Japan - Japan + 日本 Jordan - Jordan + 约旦 Malaysia - Malaysia + 马来西亚 Mexico - Mexico + 墨西哥 Morocco - Morocco + 摩洛哥 Netherlands - Netherlands + 荷兰 New Zealand - New Zealand + 新西兰 Peru - Peru + 秘鲁 Philippines - Philippines + 菲律宾 Poland - Poland + 波兰 Russia - Russia + 俄罗斯 Saudi Arabia - Saudi Arabia + 沙特阿拉伯 @@ -775,22 +771,22 @@ South Africa - South Africa + 南非 South Korea - South Korea + 韩国 Spain - Spain + 西班牙 Sweden - Sweden + 瑞典 @@ -800,12 +796,12 @@ United Arab Emirates - United Arab Emirates + 阿拉伯联合酋长国 United States - United States + 美国 @@ -898,7 +894,7 @@ Maybe updating this application could fix the problem. - 或许更新程序能解决这问题。 + 或许更新程序能解决此问题。 @@ -923,7 +919,7 @@ Most popular music videos on YouTube%1 - 在 YouTube%1 上最受欢迎的音乐视频 + 在 YouTube%1 上最受欢迎的MV @@ -971,4 +967,4 @@ 错误 - + \ No newline at end of file diff -Nru smtube-2.0/src/version.cpp smtube-2.1/src/version.cpp --- smtube-2.0/src/version.cpp 2014-03-13 22:25:13.000000000 +0000 +++ smtube-2.1/src/version.cpp 2014-03-25 22:07:22.000000000 +0000 @@ -20,7 +20,7 @@ #define USE_SVN_VERSIONS 0 -#define VERSION "2.0" +#define VERSION "2.1" #if USE_SVN_VERSIONS #include "svn_revision.h" diff -Nru smtube-2.0/src/ytdialog.cpp smtube-2.1/src/ytdialog.cpp --- smtube-2.0/src/ytdialog.cpp 2014-03-09 22:43:34.000000000 +0000 +++ smtube-2.1/src/ytdialog.cpp 2014-03-23 10:32:20.000000000 +0000 @@ -898,7 +898,7 @@ if (!downloader) downloader = new CodeDownloader(this); downloader->saveAs(script_file); downloader->show(); - downloader->download(QUrl("http://updates.smplayer.info/ytcode.script")); + downloader->download(QUrl("http://updates.smplayer.info/yt.js")); } #else QMessageBox::warning(this, tr("Problems with Youtube"), diff -Nru smtube-2.0/src/ytsig.cpp smtube-2.1/src/ytsig.cpp --- smtube-2.0/src/ytsig.cpp 2014-03-07 04:10:31.000000000 +0000 +++ smtube-2.1/src/ytsig.cpp 2014-03-23 10:32:20.000000000 +0000 @@ -83,10 +83,11 @@ if (!bytes.isEmpty()) { script = bytes; - QRegExp rx("TS: ([\\d,a-z,A-Z-]+)"); + QRegExp rx("D: ([\\d,a-z,A-Z-]+)"); if (rx.indexIn(bytes)) { - parsed_ts = rx.cap(0); - qDebug("YTSig::reloadScriptFile: parsed_ts: %s", parsed_ts.toLatin1().constData()); + QByteArray d = rx.cap(1).toLatin1(); + qDebug("YTSig::reloadScriptFile: d: %s", d.constData()); + parsed_ts = QByteArray::fromBase64(d); } } @@ -121,7 +122,7 @@ void YTSig::check(QString & u) { if (!parsed_ts.isEmpty()) { - u.append(QString("%1%2%3").arg(QChar(38)).arg(QChar(115)).arg(parsed_ts.replace(": ","=").toLower())); + u.append(QString("&%1").arg(parsed_ts)); } }