"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/mediawidget.cpp" between
kaffeine-2.0.16.tar.gz and kaffeine-2.0.17.tar.gz

About: Kaffeine is a full featured Multimedia-Player for KDE (default backend is xine).

mediawidget.cpp  (kaffeine-2.0.16)	:	mediawidget.cpp  (kaffeine-2.0.17)
skipping to change at line 27		skipping to change at line 27
* with this program; if not, write to the Free Software Foundation, Inc.,		* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/		*/
#include "log.h"		#include "log.h"
#include <KActionCollection>		#include <KActionCollection>
#include <KConfigGroup>		#include <KConfigGroup>
#include <KSharedConfig>		#include <KSharedConfig>
#include <KToolBar>		#include <KToolBar>
		#include <QAbstractItemView>
#include <QBoxLayout>		#include <QBoxLayout>
#include <QComboBox>		#include <QComboBox>
#include <QContextMenuEvent>		#include <QContextMenuEvent>
#include <QDialogButtonBox>		#include <QDialogButtonBox>
#include <QDBusInterface>		#include <QDBusInterface>
#include <QFileDialog>		#include <QFileDialog>
#include <QLabel>		#include <QLabel>
#include <QMenu>		#include <QMenu>
#include <QMimeData>		#include <QMimeData>
#include <QPushButton>		#include <QPushButton>
skipping to change at line 795		skipping to change at line 796
void MediaWidget::toggleMuted()		void MediaWidget::toggleMuted()
{		{
muteAction->trigger();		muteAction->trigger();
}		}
void MediaWidget::previous()		void MediaWidget::previous()
{		{
if (source->getType() == MediaSource::Url)		if (source->getType() == MediaSource::Url)
emit playlistPrevious();		emit playlistPrevious();
backend->jumpToPreviousChapter();		source->previous();
}		}
void MediaWidget::next()		void MediaWidget::next()
{		{
if (source->getType() == MediaSource::Url)		if (source->getType() == MediaSource::Url)
emit playlistNext();		emit playlistNext();
backend->jumpToNextChapter();		source->next();
}		}
void MediaWidget::stop()		void MediaWidget::stop()
{		{
switch (backend->getPlaybackStatus()) {		switch (backend->getPlaybackStatus()) {
case Idle:		case Idle:
break;		break;
case Playing:		case Playing:
case Paused:		case Paused:
osdWidget->showText(i18nc("osd", "Stopped"), 1500);		osdWidget->showText(i18nc("osd", "Stopped"), 1500);
skipping to change at line 1105		skipping to change at line 1106
backend->getAudioStreams().size());		backend->getAudioStreams().size());
if (currentAudioStream >= backend->getAudioStreams().size()) {		if (currentAudioStream >= backend->getAudioStreams().size()) {
currentAudioStream = -1;		currentAudioStream = -1;
}		}
if (backend->getCurrentAudioStream() != currentAudioStream) {		if (backend->getCurrentAudioStream() != currentAudioStream) {
backend->setCurrentAudioStream(currentAudioStream);		backend->setCurrentAudioStream(currentAudioStream);
}		}
}		}
		audioStreamBox->view()->setMinimumWidth(audioStreamBox->view()->sizeHintF
		orColumn(0));
}		}
void MediaWidget::currentSubtitleChanged(int currentSubtitle)		void MediaWidget::currentSubtitleChanged(int currentSubtitle)
{		{
if (blockBackendUpdates)		if (blockBackendUpdates)
return;		return;
if (source->overrideSubtitles()) {		if (source->overrideSubtitles()) {
source->setCurrentSubtitle(currentSubtitle - 1);		source->setCurrentSubtitle(currentSubtitle - 1);
return;		return;
End of changes. 4 change blocks.
2 lines changed or deleted		6 lines changed or added

---