Changeset 188 for smplayer/trunk/src/baseguiplus.cpp

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/baseguiplus.cpp (modified) (15 diffs)

smplayer/trunk/src/baseguiplus.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -62 +62 @@
 #include "preferencesdialog.h"
 #include "prefinput.h"
+#endif
+
+#ifdef CHROMECAST_SUPPORT
+#include "chromecast.h"
 #endif
 
@@ -137 +141 @@
         playlistdock->setFloating(false); // To avoid that the playlist is visible for a moment
         playlistdock->setWidget(playlist);
+        playlistdock->setWindowTitle(playlist->windowTitle());
         playlistdock->setAllowedAreas(Qt::TopDockWidgetArea | 
                                   Qt::BottomDockWidgetArea
@@ -149 +154 @@
 
         connect( playlistdock, SIGNAL(closed()), this, SLOT(playlistClosed()) );
+        connect(playlist, SIGNAL(windowTitleChanged(const QString &)), playlistdock, SLOT(setWindowTitle(const QString &)));
 #if USE_DOCK_TOPLEVEL_EVENT
         connect( playlistdock, SIGNAL(topLevelChanged(bool)), 
@@ -166 +172 @@
         detachVideoAct->setCheckable(true);
         connect(detachVideoAct, SIGNAL(toggled(bool)), this, SLOT(detachVideo(bool)));
+#endif
+
+#ifdef CHROMECAST_SUPPORT
+        playOnChromecastAct = new MyAction(this, "play_on_chromecast");
+        connect(playOnChromecastAct, SIGNAL(triggered()), this, SLOT(playOnChromecast()));
 #endif
 
@@ -200 +211 @@
 #endif
 
+#ifdef SEND_AUDIO_OPTION
+        sendAudio_menu = new QMenu(this);
+        sendAudio_menu->menuAction()->setObjectName("send_audio_menu");
+        updateSendAudioMenu();
+#endif
+
 #ifdef GLOBALSHORTCUTS
         global_shortcuts = new GlobalShortcuts(this);
@@ -206 +223 @@
 #endif
 
+#ifdef CHROMECAST_SUPPORT
+        Chromecast::instance()->setSettings(settings);
+#endif
+
         retranslateStrings();
         loadConfig();
@@ -213 +234 @@
         saveConfig();
         tray->hide();
+
+#ifdef CHROMECAST_SUPPORT
+        Chromecast::deleteInstance();
+#endif
 }
 
@@ -237 +262 @@
 #ifdef SCREENS_SUPPORT
         videoMenu->insertMenu(videosize_menu->menuAction(), sendToScreen_menu);
-        //optionsMenu->addMenu(sendToScreen_menu);
 
         if (!pref->tablet_mode) {
@@ -245 +269 @@
 
         access_menu->insertMenu(tabletModeAct, sendToScreen_menu);
+#endif
+
+#ifdef SEND_AUDIO_OPTION
+        audioMenu->insertMenu(audiofilter_menu->menuAction(), sendAudio_menu);
+#endif
+
+#ifdef CHROMECAST_SUPPORT
+        playMenu->addSeparator();
+        playMenu->addAction(playOnChromecastAct);
 #endif
 }
@@ -265 +298 @@
 }
 
+void BaseGuiPlus::updateWidgets() {
+        qDebug("BaseGuiPlus::updateWidgets");
+
+        BaseGui::updateWidgets();
+
+#ifdef CHROMECAST_SUPPORT
+        playOnChromecastAct->setEnabled(!core->mdat.filename.isEmpty());
+#endif
+}
+
 void BaseGuiPlus::closeWindow() {
         qDebug("BaseGuiPlus::closeWindow");
@@ -304 +347 @@
 
 #if DOCK_PLAYLIST
-    playlistdock->setWindowTitle( tr("Playlist") );
+        // playlistdock->setWindowTitle( tr("Playlist") );
 #endif
 
 #ifdef DETACH_VIDEO_OPTION
         detachVideoAct->change("Detach video");
+#endif
+
+#ifdef CHROMECAST_SUPPORT
+        playOnChromecastAct->change(Images::icon("chromecast"), tr("Play on &Chromecast"));
 #endif
 
@@ -318 +365 @@
         detached_label->setText("<img src=\"" + Images::file("send_to_screen") + "\">" +
                 "<p style=\"color: white;\">" + tr("Video is sent to an external screen") +"</p");
+#endif
+
+#ifdef SEND_AUDIO_OPTION
+        sendAudio_menu->menuAction()->setText( tr("Send &audio to") );
+        sendAudio_menu->menuAction()->setIcon(Images::icon("send_audio"));
 #endif
 }
@@ -477 +529 @@
 
 void BaseGuiPlus::updateMediaInfo() {
-    qDebug("BaseGuiPlus::updateMediaInfo");
+        qDebug("BaseGuiPlus::updateMediaInfo");
         BaseGui::updateMediaInfo();
 
@@ -980 +1032 @@
 #endif
 
+#ifdef SEND_AUDIO_OPTION
+void BaseGuiPlus::updateSendAudioMenu() {
+        qDebug("BaseGuiPlus::updateSendAudioMenu");
+
+        sendAudio_menu->clear();
+        QAction * a = new QAction(sendAudio_menu);
+        a->setText(tr("&Default audio device"));
+        a->setData("");
+        connect(a, SIGNAL(triggered()), this, SLOT(sendAudioClicked()));
+        sendAudio_menu->addAction(a);
+
+#if USE_PULSEAUDIO_DEVICES
+        addListToSendAudioMenu( DeviceInfo::paDevices(), "pulse");
+#endif
+
+#if USE_ALSA_DEVICES
+        addListToSendAudioMenu( DeviceInfo::alsaDevices(), "alsa");
+#endif
+
+#if USE_DSOUND_DEVICES
+        if (PlayerID::player(pref->mplayer_bin) == PlayerID::MPLAYER) {
+                addListToSendAudioMenu( DeviceInfo::dsoundDevices(), "dsound");
+        }
+#endif
+
+#if MPV_AUDIO_DEVICES
+        if (PlayerID::player(pref->mplayer_bin) == PlayerID::MPV) {
+                DeviceInfo::setMpvBin(pref->mplayer_bin);
+
+                #if USE_MPV_ALSA_DEVICES
+                addListToSendAudioMenu( DeviceInfo::mpvAlsaDevices(), "alsa");
+                #endif
+
+                #if USE_MPV_WASAPI_DEVICES
+                addListToSendAudioMenu( DeviceInfo::mpvWasapiDevices(), "wasapi");
+                #endif
+        }
+#endif
+}
+
+void BaseGuiPlus::addListToSendAudioMenu(const DeviceList & audio_devices, const QString & device_name) {
+        for (int n = 0; n < audio_devices.count(); n++) {
+                QAction * a = new QAction(sendAudio_menu);
+                a->setText( DeviceInfo::printableName(device_name, audio_devices[n]) );
+                a->setData( DeviceInfo::internalName(device_name, audio_devices[n]) );
+                connect(a, SIGNAL(triggered()), this, SLOT(sendAudioClicked()));
+                sendAudio_menu->addAction(a);
+        }
+}
+
+void BaseGuiPlus::sendAudioClicked() {
+        QAction * a = qobject_cast<QAction *> (sender());
+        if (a) {
+                QString device = a->data().toString();
+                qDebug() << "BaseGuiPlus::sendAudioClicked: device:" << device;
+                core->changeAO(device);
+        }
+}
+#endif
+
+#ifdef CHROMECAST_SUPPORT
+void BaseGuiPlus::playOnChromecast() {
+        qDebug("BaseGuiPlus::playOnChromecast");
+
+        qDebug() << "BaseGuiPlus::playOnChromecast: type:" << core->mdat.type;
+        qDebug() << "BaseGuiPlus::playOnChromecast: filename:" << core->mdat.filename;
+        qDebug() << "BaseGuiPlus::playOnChromecast: stream_url:" << core->mdat.stream_url;
+        qDebug() << "BaseGuiPlus::playOnChromecast: stream_title:" << core->mdat.stream_title;
+        qDebug() << "BaseGuiPlus::playOnChromecast: stream_path:" << core->mdat.stream_path;
+
+        QString title = core->mdat.displayName(true);
+        if (core->mdat.type == TYPE_STREAM) {
+                QString url = core->mdat.filename;
+                if (!core->mdat.stream_path.isEmpty()) url = core->mdat.stream_path;
+                Chromecast::instance()->openStream(url, title);
+        }
+        else
+        if (core->mdat.type == TYPE_FILE) {
+                Chromecast::instance()->openLocal(core->mdat.filename, title);
+        }
+}
+#endif
+
 #include "moc_baseguiplus.cpp"