#include "searchparams.h"
#include "ytsinglevideosource.h"
#include "channelaggregator.h"
-#include "utils.h"
-#include "ytuser.h"
+#include "iconutils.h"
+#include "ytchannel.h"
#ifdef APP_SNAPSHOT
#include "snapshotsettings.h"
#endif
#include "datautils.h"
+#include "compatibility/qurlqueryhelper.h"
namespace The {
NetworkAccess* http();
return i;
}
-MediaView::MediaView(QWidget *parent) : QWidget(parent),
- stopped(false),
- #ifdef APP_SNAPSHOT
- snapshotSettings(0),
- #endif
- downloadItem(0) { }
+MediaView::MediaView(QWidget *parent) : QWidget(parent)
+ , stopped(false)
+ , downloadItem(0)
+ #ifdef APP_SNAPSHOT
+ , snapshotSettings(0)
+ #endif
+ , pauseTime(0)
+{ }
void MediaView::initialize() {
QBoxLayout *layout = new QVBoxLayout(this);
connect(playlistModel, SIGNAL(haveSuggestions(const QStringList &)),
sidebar, SLOT(showSuggestions(const QStringList &)));
connect(sidebar, SIGNAL(suggestionAccepted(QString)),
- MainWindow::instance(), SLOT(startToolbarSearch(QString)));
+ MainWindow::instance(), SLOT(search(QString)));
splitter->addWidget(sidebar);
videoAreaWidget = new VideoAreaWidget(this);
QSettings settings;
splitter->restoreState(settings.value("splitter").toByteArray());
splitter->setChildrenCollapsible(false);
+ connect(splitter, SIGNAL(splitterMoved(int,int)), SLOT(maybeAdjustWindowSize()));
layout->addWidget(splitter);
}
}
}
- setVideoSource(new YTSearch(searchParams, this));
+ YTSearch *ytSearch = new YTSearch(searchParams, this);
+ ytSearch->setAsyncDetails(true);
+ connect(ytSearch, SIGNAL(gotDetails()), playlistModel, SLOT(emitDataChanged()));
+ setVideoSource(ytSearch);
}
void MediaView::setVideoSource(VideoSource *videoSource, bool addToHistory, bool back) {
+ Q_UNUSED(back);
stopped = false;
#ifdef APP_ACTIVATION
sidebar->getHeader()->updateInfo();
SearchParams *searchParams = getSearchParams();
- bool isChannel = searchParams && !searchParams->author().isEmpty();
+ bool isChannel = searchParams && !searchParams->channelId().isEmpty();
playlistView->setClickableAuthors(!isChannel);
}
void MediaView::appear() {
- playlistView->setFocus();
Video *currentVideo = playlistModel->activeVideo();
if (currentVideo) {
MainWindow::instance()->setWindowTitle(
currentVideo->title() + " - " + Constants::NAME);
- MainWindow::instance()->showMessage(currentVideo->description());
}
+
+ // optimize window for 16:9 video
+ QTimer::singleShot(50, this, SLOT(maybeAdjustWindowSize()));
+
+ playlistView->setFocus();
}
void MediaView::disappear() {
}
-void MediaView::handleError(QString /* message */) {
+void MediaView::handleError(const QString &message) {
+ qWarning() << __PRETTY_FUNCTION__ << message;
#ifdef APP_PHONON_SEEK
mediaObject->play();
#else
#ifdef APP_PHONON
void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/) {
- if (newState == Phonon::PlayingState)
+ if (pauseTime > 0 && (newState == Phonon::PlayingState || newState == Phonon::BufferingState)) {
+ mediaObject->seek(pauseTime);
+ pauseTime = 0;
+ }
+ if (newState == Phonon::PlayingState) {
videoAreaWidget->showVideo();
- else if (newState == Phonon::ErrorState) {
- qDebug() << "Phonon error:" << mediaObject->errorString() << mediaObject->errorType();
+ } else if (newState == Phonon::ErrorState) {
+ qWarning() << "Phonon error:" << mediaObject->errorString() << mediaObject->errorType();
if (mediaObject->errorType() == Phonon::FatalError)
handleError(mediaObject->errorString());
}
switch( mediaObject->state() ) {
case Phonon::PlayingState:
mediaObject->pause();
+ pauseTimer.start();
break;
default:
- mediaObject->play();
+ if (pauseTimer.hasExpired(60000)) {
+ pauseTimer.invalidate();
+ connect(playlistModel->activeVideo(), SIGNAL(gotStreamUrl(QUrl)), SLOT(resumeWithNewStreamUrl(QUrl)));
+ playlistModel->activeVideo()->loadStreamUrl();
+ } else mediaObject->play();
break;
}
#endif
}
-QRegExp MediaView::wordRE(QString s) {
+QRegExp MediaView::wordRE(const QString &s) {
return QRegExp("\\W" + s + "\\W?", Qt::CaseInsensitive);
}
// video title in titlebar
MainWindow::instance()->setWindowTitle(video->title() + " - " + Constants::NAME);
- MainWindow::instance()->showMessage(video->description());
// ensure active item is visible
if (row != -1) {
a->setEnabled(enableDownload);
a->setVisible(enableDownload);
- updateSubscriptionAction(video, YTUser::isSubscribed(video->userId()));
+ updateSubscriptionAction(video, YTChannel::isSubscribed(video->channelId()));
foreach (QAction *action, currentVideoActions)
action->setEnabled(true);
if (snapshotSettings) {
delete snapshotSettings;
snapshotSettings = 0;
+ MainWindow::instance()->adjustStatusBarVisibility();
}
// see you in gotStreamUrl...
startDownloading();
#endif
- // ensure we always have 10 videos ahead
+ // ensure we always have videos ahead
playlistModel->searchNeeded();
// ensure active item is visible
#endif
#ifdef APP_EXTRA
- Extra::notify(video->title(), video->author(), video->formattedDuration());
+ Extra::notify(video->title(), video->channelTitle(), video->formattedDuration());
#endif
ChannelAggregator::instance()->videoWatched(video);
const qint64 currentTime = mediaObject->currentTime();
qDebug() << __PRETTY_FUNCTION__ << mediaObject->currentTime() << totalTime;
// add 10 secs for imprecise Phonon backends (VLC, Xine)
- if (totalTime < 1 || (currentTime > 0 && currentTime + 10000 < totalTime)) {
+ if (currentTime > 0 && currentTime + 10000 < totalTime) {
// mediaObject->seek(currentTime);
QTimer::singleShot(500, this, SLOT(playbackResume()));
} else {
#ifdef APP_PHONON
mediaObject->pause();
#endif
- QDesktopServices::openUrl(video->webpage());
+ QString url = video->webpage() + QLatin1String("&t=") + QString::number(mediaObject->currentTime() / 1000);
+ QDesktopServices::openUrl(url);
}
void MediaView::copyWebPage() {
Video* video = playlistModel->activeVideo();
if (!video) return;
- QString address = video->webpage().toString();
+ QString address = video->webpage();
QApplication::clipboard()->setText(address);
QString message = tr("You can now paste the YouTube link into another application");
MainWindow::instance()->showMessage(message);
if (!video) return;
QString location = SnapshotSettings::getCurrentLocation();
+ QDir dir(location);
+ if (!dir.exists()) dir.mkpath(location);
QString basename = video->title();
QString format = video->duration() > 3600 ? "h_mm_ss" : "m_ss";
basename += " (" + QTime().addSecs(currentTime).toString(format) + ")";
#ifdef APP_EXTRA
Extra::fadeInWidget(statusBar, statusBar);
#endif
- statusBar->clearMessage();
statusBar->insertPermanentWidget(0, snapshotSettings);
snapshotSettings->show();
+ MainWindow::instance()->setStatusBarVisibility(true);
}
#endif
downloadItem->start();
}
+void MediaView::resumeWithNewStreamUrl(const QUrl &streamUrl) {
+ pauseTime = mediaObject->currentTime();
+ mediaObject->setCurrentSource(streamUrl);
+ mediaObject->play();
+
+ Video *video = static_cast<Video *>(sender());
+ if (!video) {
+ qDebug() << "Cannot get sender in" << __PRETTY_FUNCTION__;
+ return;
+ }
+ video->disconnect(this);
+}
+
+void MediaView::maybeAdjustWindowSize() {
+ QSettings settings;
+ if (settings.value("adjustWindowSize", true).toBool())
+ adjustWindowSize();
+}
+
void MediaView::sliderMoved(int value) {
+ Q_UNUSED(value);
#ifdef APP_PHONON
#ifndef APP_PHONON_SEEK
SearchParams *searchParams = new SearchParams();
searchParams->setTransient(true);
searchParams->setKeywords(query);
- searchParams->setAuthor(video->author());
+ searchParams->setChannelId(video->channelId());
/*
if (!numberAsWords) {
Video* video = playlistModel->activeVideo();
if (!video) return;
YTSingleVideoSource *singleVideoSource = new YTSingleVideoSource();
- singleVideoSource->setVideoId(video->id());
+ singleVideoSource->setVideo(video->clone());
+ singleVideoSource->setAsyncDetails(true);
setVideoSource(singleVideoSource);
The::globalActions()->value("related-videos")->setEnabled(false);
}
Video* video = playlistModel->activeVideo();
if (!video) return;
QUrl url("https://twitter.com/intent/tweet");
-#if QT_VERSION >= 0x050000
{
- QUrl &u = url;
- QUrlQuery url;
-#endif
- url.addQueryItem("via", "minitubeapp");
- url.addQueryItem("text", video->title());
- url.addQueryItem("url", video->webpage().toString());
-#if QT_VERSION >= 0x050000
- u.setQuery(url);
+ QUrlQueryHelper urlHelper(url);
+ urlHelper.addQueryItem("via", "minitubeapp");
+ urlHelper.addQueryItem("text", video->title());
+ urlHelper.addQueryItem("url", video->webpage());
}
-#endif
QDesktopServices::openUrl(url);
}
Video* video = playlistModel->activeVideo();
if (!video) return;
QUrl url("https://www.facebook.com/sharer.php");
-#if QT_VERSION >= 0x050000
{
- QUrl &u = url;
- QUrlQuery url;
-#endif
- url.addQueryItem("t", video->title());
- url.addQueryItem("u", video->webpage().toString());
-#if QT_VERSION >= 0x050000
- u.setQuery(url);
+ QUrlQueryHelper urlHelper(url);
+ urlHelper.addQueryItem("t", video->title());
+ urlHelper.addQueryItem("u", video->webpage());
}
-#endif
QDesktopServices::openUrl(url);
}
Video* video = playlistModel->activeVideo();
if (!video) return;
QUrl url("http://bufferapp.com/add");
-#if QT_VERSION >= 0x050000
{
- QUrl &u = url;
- QUrlQuery url;
-#endif
- url.addQueryItem("via", "minitubeapp");
- url.addQueryItem("text", video->title());
- url.addQueryItem("url", video->webpage().toString());
- url.addQueryItem("picture", video->thumbnailUrl());
-#if QT_VERSION >= 0x050000
- u.setQuery(url);
+ QUrlQueryHelper urlHelper(url);
+ urlHelper.addQueryItem("via", "minitubeapp");
+ urlHelper.addQueryItem("text", video->title());
+ urlHelper.addQueryItem("url", video->webpage());
+ urlHelper.addQueryItem("picture", video->thumbnailUrl());
}
-#endif
QDesktopServices::openUrl(url);
}
Video* video = playlistModel->activeVideo();
if (!video) return;
QUrl url("mailto:");
-#if QT_VERSION >= 0x050000
{
- QUrl &u = url;
- QUrlQuery url;
-#endif
- url.addQueryItem("subject", video->title());
- QString body = video->title() + "\n" +
- video->webpage().toString() + "\n\n" +
+ QUrlQueryHelper urlHelper(url);
+ urlHelper.addQueryItem("subject", video->title());
+ const QString body = video->title() + "\n" +
+ video->webpage() + "\n\n" +
tr("Sent from %1").arg(Constants::NAME) + "\n" +
Constants::WEBSITE;
- url.addQueryItem("body", body);
-#if QT_VERSION >= 0x050000
- u.setQuery(url);
+ urlHelper.addQueryItem("body", body);
}
-#endif
QDesktopServices::openUrl(url);
}
Video* video = playlistModel->videoAt(index.row());
if (!video) return;
- QString channel = video->userId();
- if (channel.isEmpty()) channel = video->author();
- if (channel.isEmpty()) return;
+ QString channelId = video->channelId();
+ // if (channelId.isEmpty()) channelId = video->channelTitle();
+ if (channelId.isEmpty()) return;
SearchParams *searchParams = new SearchParams();
- searchParams->setAuthor(channel);
+ searchParams->setChannelId(channelId);
searchParams->setSortBy(SearchParams::SortByNewest);
// go!
subscribeText = subscribeAction->property("originalText").toString();
subscribeAction->setEnabled(false);
} else if (subscribed) {
- subscribeText = tr("Unsubscribe from %1").arg(video->author());
+ subscribeText = tr("Unsubscribe from %1").arg(video->channelTitle());
subscribeTip = subscribeText;
subscribeAction->setEnabled(true);
} else {
- subscribeText = tr("Subscribe to %1").arg(video->author());
+ subscribeText = tr("Subscribe to %1").arg(video->channelTitle());
subscribeTip = subscribeText;
subscribeAction->setEnabled(true);
}
subscribeAction->setStatusTip(subscribeTip);
if (subscribed) {
-#ifdef Q_OS_LINUX
+#ifdef APP_LINUX
static QIcon tintedIcon;
if (tintedIcon.isNull()) {
QList<QSize> sizes;
sizes << QSize(16, 16);
- tintedIcon = Utils::tintedIcon("bookmark-new", QColor(254, 240, 0), sizes);
+ tintedIcon = IconUtils::tintedIcon("bookmark-new", QColor(254, 240, 0), sizes);
}
subscribeAction->setIcon(tintedIcon);
#else
- subscribeAction->setIcon(Utils::icon("bookmark-remove"));
+ subscribeAction->setIcon(IconUtils::icon("bookmark-remove"));
#endif
} else {
- subscribeAction->setIcon(Utils::icon("bookmark-new"));
+ subscribeAction->setIcon(IconUtils::icon("bookmark-new"));
}
- Utils::setupAction(subscribeAction);
+ IconUtils::setupAction(subscribeAction);
}
void MediaView::toggleSubscription() {
Video *video = playlistModel->activeVideo();
if (!video) return;
- QString userId = video->userId();
+ QString userId = video->channelId();
if (userId.isEmpty()) return;
- bool subscribed = YTUser::isSubscribed(userId);
- if (subscribed) YTUser::unsubscribe(userId);
- else YTUser::subscribe(userId);
+ bool subscribed = YTChannel::isSubscribed(userId);
+ if (subscribed) {
+ YTChannel::unsubscribe(userId);
+ MainWindow::instance()->showMessage(tr("Unsubscribed from %1").arg(video->channelTitle()));
+ } else {
+ YTChannel::subscribe(userId);
+ MainWindow::instance()->showMessage(tr("Subscribed to %1").arg(video->channelTitle()));
+ }
updateSubscriptionAction(video, !subscribed);
}
+
+void MediaView::adjustWindowSize() {
+ if (!MainWindow::instance()->isMaximized() && !MainWindow::instance()->isFullScreen()) {
+ const double ratio = 16. / 9.;
+ const int w = videoAreaWidget->width();
+ const int h = videoAreaWidget->height();
+ const double currentVideoRatio = (double)w / (double)h;
+ if (currentVideoRatio != ratio) {
+ if (false && currentVideoRatio > ratio) {
+ // we have vertical black bars
+ int newWidth = (MainWindow::instance()->width() - w) + (h * ratio);
+ MainWindow::instance()->resize(newWidth, MainWindow::instance()->height());
+ } else {
+ // horizontal black bars
+ int newHeight = (MainWindow::instance()->height() - h) + (w / ratio);
+ MainWindow::instance()->resize(MainWindow::instance()->width(), newHeight);
+ }
+ }
+ }
+}
projects / minitube / blobdiff