Hello community, here is the log from the commit of package dragonplayer for openSUSE:Factory checked in at 2013-07-08 07:31:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dragonplayer (Old) and /work/SRC/openSUSE:Factory/.dragonplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dragonplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/dragonplayer/dragonplayer.changes 2013-06-11 09:26:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dragonplayer.new/dragonplayer.changes 2013-07-08 07:31:57.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:22:15 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:30:46 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- dragon-4.10.4.tar.xz New: ---- dragon-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dragonplayer.spec ++++++ --- /var/tmp/diff_new_pack.GyvIug/_old 2013-07-08 07:31:58.000000000 +0200 +++ /var/tmp/diff_new_pack.GyvIug/_new 2013-07-08 07:31:58.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Url: http://dragonplayer.org/ -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: dragon-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ dragon-4.10.4.tar.xz -> dragon-4.10.90.tar.xz ++++++ Files old/dragon-4.10.4/doc/index.cache.bz2 and new/dragon-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/doc/index.docbook new/dragon-4.10.90/doc/index.docbook --- old/dragon-4.10.4/doc/index.docbook 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/doc/index.docbook 2013-06-25 20:35:33.000000000 +0200 @@ -41,8 +41,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2010-10-21</date> -<releaseinfo>2.0 (&kde; 4.5)</releaseinfo> +<date>2013-05-11</date> +<releaseinfo>2.0 (&kde; 4.11)</releaseinfo> <abstract> <para> @@ -76,7 +76,7 @@ <para> -&dragonplayer; is a simple media player using Phonon technology. &dragonplayer; is a no frills media player that excels at playing DVDs and movie files without getting in your way. +&dragonplayer; is a simple media player using &phonon; technology. &dragonplayer; is a no frills media player that excels at playing DVDs and movie files without getting in your way. </para> </chapter> @@ -98,7 +98,8 @@ <para>There are three ways to play a video file:</para> <para><guibutton>Play File</guibutton> opens the file dialog and allows you to select a file to play.</para> -<para><guibutton>Play Disc</guibutton> to play a CD or DVD.</para> +<para><guibutton>Play Disc</guibutton> to play a &CD; or DVD.</para> +<para><guibutton>Play Stream</guibutton> opens a dialog to enter an address of some <ulink url="http://en.wikipedia.org/wiki/Streaming_media";>multimedia stream</ulink>.</para> <para>Double click on an entry in the play list with recently opened files to start playing it. The context menu of the play list shows actions to remove a selected entry or clear the whole play list. Any file you played will be automatically added to the list.</para> @@ -189,8 +190,8 @@ </para> <!-- TRANS:CREDIT_FOR_TRANSLATORS --> -&underGPL; &underFDL; +&underGPL; </chapter> Files old/dragon-4.10.4/doc/playmedia.png and new/dragon-4.10.90/doc/playmedia.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/misc/dragonplayer-opendvd.desktop new/dragon-4.10.90/misc/dragonplayer-opendvd.desktop --- old/dragon-4.10.4/misc/dragonplayer-opendvd.desktop 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/misc/dragonplayer-opendvd.desktop 2013-06-10 20:54:07.000000000 +0200 @@ -8,6 +8,7 @@ Name[bg]=Отваряне с програма за видео (Dragon Player) Name[bs]=Otvori programom Dragon Player Name[ca]=Obre amb el reproductor de vídeo (Dragon Player) +Name[ca@valencia]=Obri amb el reproductor de vídeo (Dragon Player) Name[cs]=Otevřít v přehrávači videa (Dragon) Name[da]=Åbn med videoafspiller (Dragon Player) Name[de]=Mit der Video-Wiedergabe öffnen (Dragon Player) @@ -20,6 +21,7 @@ Name[gl]=Abrir co reprodutor de vídeo (Dragon Player) Name[hu]=Megnyitás videolejátszóval (Dragon Player) Name[ia]=Aperi con Video Player (Dragon Player) +Name[is]=Opna með vídeóspilara (Dragon spilarinn) Name[it]=Apri con riproduttore video (Dragon Player) Name[kk]=Бейне (Dragon) ойнатқышында ашу Name[km]=បើកជាមួយកម្មវិធីចាក់វីដេអូ (កម្មវិធី Dragon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/misc/dragonplayer.desktop new/dragon-4.10.90/misc/dragonplayer.desktop --- old/dragon-4.10.4/misc/dragonplayer.desktop 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/misc/dragonplayer.desktop 2013-06-10 20:54:07.000000000 +0200 @@ -5,6 +5,7 @@ Name[bg]=Програма за видео Dragon Name[bs]=Dragon Player Name[ca]=Dragon Player +Name[ca@valencia]=Dragon Player Name[cs]=Přehrávač Dragon Name[da]=Dragon Player Name[de]=Dragon Player @@ -17,6 +18,7 @@ Name[gl]=Dragon Player Name[hu]=Dragon Player Name[ia]=Dragon Player +Name[is]=Dragon spilari Name[it]=Dragon Player Name[kk]=Dragon ойнатқышы Name[km]=កម្មវិធីចាក់ Dragon @@ -49,6 +51,7 @@ GenericName[bg]=Възпроизвеждане на видео GenericName[bs]=Video izvođač GenericName[ca]=Reproductor de vídeo +GenericName[ca@valencia]=Reproductor de vídeo GenericName[cs]=Přehrávač videa GenericName[da]=Videoafspiller GenericName[de]=Video-Wiedergabe @@ -61,6 +64,7 @@ GenericName[gl]=Reprodutor de vídeo GenericName[hu]=Videolejátszó GenericName[ia]=Reproductor de Video +GenericName[is]=Vídeóspilari GenericName[it]=Riproduttore video GenericName[kk]=Бейне ойнатқышы GenericName[km]=កម្មវិធីចាក់វីដេអូ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/misc/dragonplayer_part.desktop new/dragon-4.10.90/misc/dragonplayer_part.desktop --- old/dragon-4.10.4/misc/dragonplayer_part.desktop 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/misc/dragonplayer_part.desktop 2013-06-10 20:54:07.000000000 +0200 @@ -5,6 +5,7 @@ Name[bg]=Програма за видео Dragon Name[bs]=Dio Dragon Player-a Name[ca]=Part del Dragon Player +Name[ca@valencia]=Part del Dragon Player Name[cs]=Komponenta přehrávače Dragon Name[da]=Dragon Player-part Name[de]=Dragon-Player-Komponente @@ -17,6 +18,7 @@ Name[gl]=Compoñente do Dragon Player Name[hu]=Dragon Player objektum Name[ia]=Parte de Dragon Player +Name[is]=Dragon spilaraeining Name[it]=Componente Dragon Player Name[kk]=Dragon ойнатқыш бөлшегі Name[km]=ផ្នែកនៃកម្មវិធី Dragon @@ -49,6 +51,7 @@ Comment[bg]=Вградена програма за видео Comment[bs]=Ugradivi video plejer Comment[ca]=Reproductor de vídeo incrustat +Comment[ca@valencia]=Reproductor de vídeo incrustat Comment[cs]=Vložený přehrávač videa Comment[da]=Videoafspiller som kan indlejres Comment[de]=Einbettbarer Videospieler @@ -61,6 +64,7 @@ Comment[gl]=Reprodutor incrustábel de vídeo Comment[hu]=Beágyazható videolejátszó Comment[ia]=Reproductor de Video Insertabile +Comment[is]=Ígræðanlegur vídeóspilari Comment[it]=Lettore video integrabile Comment[kk]=Ендірілетін бейне ойнатқышы Comment[km]=កម្មវិធីចាក់វីដេអូដែលអាចបង្កប់បាន diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/misc/dragonplayer_play_dvd.desktop new/dragon-4.10.90/misc/dragonplayer_play_dvd.desktop --- old/dragon-4.10.4/misc/dragonplayer_play_dvd.desktop 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/misc/dragonplayer_play_dvd.desktop 2013-06-10 20:54:07.000000000 +0200 @@ -9,6 +9,7 @@ Name[bg]=Възпроизвеждане на DVD с Dragon Name[bs]=Emituj DVD Dragon Playerom Name[ca]=Reprodueix DVD amb el Dragon Player +Name[ca@valencia]=Reprodueix DVD amb el Dragon Player Name[cs]=Přehrát DVD pomocí přehrávače Dragon Name[da]=Afspil dvd med Dragon Player Name[de]=DVD mit Dragon Player abspielen @@ -21,6 +22,7 @@ Name[gl]=Reproducir o DVD co Dragon Player Name[hu]=DVD lejátszása a Dragon Playerrel Name[ia]=Reproduce DVD con Dragon Player +Name[is]=Spila DVD með Dragon spilaranum Name[it]=Riproduci DVD con Dragon Player Name[kk]=DVD-ні Dragon ойнатқышында орындау Name[km]=ចាក់ឌីវីឌីជាមួយកម្មវិធី Dragon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/analyzer/blockAnalyzer.h new/dragon-4.10.90/src/app/analyzer/blockAnalyzer.h --- old/dragon-4.10.4/src/app/analyzer/blockAnalyzer.h 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/analyzer/blockAnalyzer.h 2013-06-10 20:54:07.000000000 +0200 @@ -59,7 +59,7 @@ void determineStep(); private: - QPixmap* const bar() { return &m_barPixmap; } + QPixmap* bar() { return &m_barPixmap; } uint m_columns, m_rows; //number of rows and columns of blocks uint m_y; //y-offset from top of widget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/loadView.cpp new/dragon-4.10.90/src/app/loadView.cpp --- old/dragon-4.10.4/src/app/loadView.cpp 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/loadView.cpp 2013-06-10 20:54:07.000000000 +0200 @@ -38,9 +38,12 @@ m_playDiskButton->setIconSize( QSize( KIconLoader::SizeMedium, KIconLoader::SizeMedium ) ); m_playFileButton->setIcon( KIcon( QLatin1String( "folder" ) ) ); m_playFileButton->setIconSize( QSize( KIconLoader::SizeMedium, KIconLoader::SizeMedium ) ); + m_playStreamButton->setIcon( KIcon( QLatin1String( "document-open-remote" ) ) ); + m_playStreamButton->setIconSize( QSize( KIconLoader::SizeMedium, KIconLoader::SizeMedium ) ); connect( m_playDiskButton, SIGNAL(released()), this, SIGNAL(openDVDPressed()) ); connect( m_playFileButton, SIGNAL(released()), this, SIGNAL(openFilePressed()) ); + connect( m_playStreamButton, SIGNAL(released()), this, SIGNAL(openStreamPressed()) ); connect( m_recentlyPlayed, SIGNAL(itemDoubleClicked(KUrl)), this, SIGNAL(loadUrl(KUrl)) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/loadView.h new/dragon-4.10.90/src/app/loadView.h --- old/dragon-4.10.4/src/app/loadView.h 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/loadView.h 2013-06-10 20:54:07.000000000 +0200 @@ -37,6 +37,7 @@ void loadUrl(KUrl); void openFilePressed(); void openDVDPressed(); + void openStreamPressed(); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/loadView.ui new/dragon-4.10.90/src/app/loadView.ui --- old/dragon-4.10.4/src/app/loadView.ui 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/loadView.ui 2013-06-10 20:54:07.000000000 +0200 @@ -28,6 +28,13 @@ </widget> </item> <item> + <widget class="QPushButton" name="m_playStreamButton"> + <property name="text"> + <string>Play Stream</string> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/mainWindow.cpp new/dragon-4.10.90/src/app/mainWindow.cpp --- old/dragon-4.10.4/src/app/mainWindow.cpp 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/mainWindow.cpp 2013-06-10 20:54:07.000000000 +0200 @@ -28,6 +28,7 @@ #include <KCursor> #include <KDebug> #include <KFileDialog> //::open() +#include <KInputDialog> #include <KGlobalSettings> //::timerEvent() #include <KIO/NetAccess> #include <KLocale> @@ -100,6 +101,7 @@ , m_stopScreenSaver( 0 ) , m_stopSleepCookie( -1 ) , m_stopScreenPowerMgmtCookie( -1 ) + , m_profileMaxDays(30) , m_toolbarIsHidden(false) , m_statusbarIsHidden(false) , m_menuBarIsHidden(false) @@ -204,10 +206,11 @@ //connect the stuff in loadView connect( m_loadView, SIGNAL(openDVDPressed()), this, SLOT(playDisc()) ); connect( m_loadView, SIGNAL(openFilePressed()), this, SLOT(openFileDialog()) ); + connect( m_loadView, SIGNAL(openStreamPressed()), this, SLOT(openStreamDialog()) ); connect( m_loadView, SIGNAL(loadUrl(KUrl)), this, SLOT(open(KUrl)) ); //connect the video player - connect( engine(), SIGNAL(stateUpdated(Phonon::State,Phonon::State)), this, SLOT(engineStateChanged(Phonon::State,Phonon::State)) ); + connect( engine(), SIGNAL(stateUpdated(Phonon::State,Phonon::State)), this, SLOT(engineStateChanged(Phonon::State)) ); connect( engine(), SIGNAL(currentSourceChanged(Phonon::MediaSource)), this, SLOT(engineMediaChanged(Phonon::MediaSource)) ); connect( engine(), SIGNAL(seekableChanged(bool)), this, SLOT(engineSeekableChanged(bool)) ); connect( engine(), SIGNAL(metaDataChanged()), this, SLOT(engineMetaDataChanged()) ); @@ -534,7 +537,7 @@ kDebug() << url; if( load( url ) ) { - const int offset = TheStream::hasProfile() + const int offset = (TheStream::hasProfile() && isFresh()) // adjust offset if we have session history for this video ? TheStream::profile().readEntry<int>( "Position", 0 ) : 0; @@ -587,7 +590,7 @@ //let xine handle invalid, etc, KUrlS //TODO it handles non-existing files with bad error message - bool ret = engine()->load( url ); + const bool ret = engine()->load( url ); if( ret ) { if( TheStream::hasVideo() ) @@ -637,10 +640,20 @@ mimeFilter << QLatin1String( "video/mp4" ); mimeFilter << QLatin1String( "application/x-cd-image" ); // added for *.iso images - const KUrl url = - KFileDialog::getOpenUrl(KGlobalSettings::videosPath(), - mimeFilter.join(QLatin1String(" ")), - this, i18n("Select File to Play") ); + static KUrl lastDirectory; + + KFileDialog dlg( KGlobalSettings::videosPath(), mimeFilter.join(QLatin1String( " " ) ), this ); + dlg.setCaption( i18n("Select File to Play") ); + dlg.setOperationMode( KFileDialog::Opening ); + + if( !lastDirectory.isEmpty() ) + dlg.setUrl( lastDirectory ); + + dlg.exec(); + + lastDirectory = dlg.baseUrl(); + const KUrl url = dlg.selectedFile(); + if( url.isEmpty() ) { kDebug() << "URL empty in MainWindow::playDialogResult()"; @@ -653,6 +666,22 @@ } void +MainWindow::openStreamDialog() +{ + KUrl url(KInputDialog::getText( i18nc("@title:window", "Stream to Play"), i18n("Stream:") )); + + if( url.isEmpty() ) + { + kDebug() << "URL empty in MainWindow::openStreamDialog()"; + return; + } + else + { + open( url ); + } +} + +void MainWindow::playDisc() { QList< Solid::Device > playableDiscs; @@ -939,6 +968,13 @@ return action; } +bool MainWindow::isFresh() +{ + QDate date = QDate::fromString(TheStream::profile().readEntry<QString>( "Date", QDate::currentDate().toString("dd/MM/yyyy") ), "dd/MM/yyyy"); + + return (date.daysTo(QDate::currentDate()) < m_profileMaxDays) ? true : false; +} + } //namespace Dragon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/mainWindow.h new/dragon-4.10.90/src/app/mainWindow.h --- old/dragon-4.10.4/src/app/mainWindow.h 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/mainWindow.h 2013-06-10 20:54:07.000000000 +0200 @@ -75,6 +75,7 @@ bool open( const KUrl& ); void playDisc(); void openFileDialog(); + void openStreamDialog(); void play(); void toggleVideoSettings( bool ); void toggleVolumeSlider( bool ); @@ -93,7 +94,7 @@ void mutedChanged( bool ); void stop(); //in stateChange.cpp - void engineStateChanged( Phonon::State, Phonon::State = Phonon::StoppedState); + void engineStateChanged( Phonon::State ); void engineMediaChanged( Phonon::MediaSource ); void engineSeekableChanged( bool ); void engineMetaDataChanged(); @@ -105,6 +106,7 @@ void setupActions(); void updateSliders(); void updateTitleBarText(); + bool isFresh(); QMenu *menu( const char *name ); @@ -140,6 +142,7 @@ int m_screensaverDisableCookie; int m_stopSleepCookie; int m_stopScreenPowerMgmtCookie; + int m_profileMaxDays; bool m_toolbarIsHidden; bool m_statusbarIsHidden; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/stateChange.cpp new/dragon-4.10.90/src/app/stateChange.cpp --- old/dragon-4.10.4/src/app/stateChange.cpp 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/stateChange.cpp 2013-06-10 20:54:07.000000000 +0200 @@ -36,11 +36,10 @@ namespace Dragon { void -MainWindow::engineStateChanged( Phonon::State state, Phonon::State oldstate ) +MainWindow::engineStateChanged( Phonon::State state ) { bool const isFullScreen = toggleAction("fullscreen")->isChecked(); bool const hasMedia = TheStream::hasMedia(); - QWidget *const toolbar = reinterpret_cast<QWidget*>(toolBar()); switch(state) { @@ -129,10 +128,7 @@ void MainWindow::engineMediaChanged(Phonon::MediaSource /*newSource*/) { -#ifdef __GNUC__ -#warning FIXME -#endif -// m_audioView->updateText(); + m_audioView->update(); // update recently played list kDebug() << " update recent files list "; @@ -169,14 +165,13 @@ { kDebug() << "metaDataChanged"; updateTitleBarText(); -#ifdef __GNUC__ -#warning FIXME -#endif -// m_audioView->updateText(); + m_audioView->update(); } -void MainWindow::engineHasVideoChanged(bool hasVideo) +void MainWindow::engineHasVideoChanged( bool hasVideo ) { + Q_UNUSED(hasVideo); + kDebug() << "hasVideo changed"; if( TheStream::hasVideo() ) { @@ -189,7 +184,7 @@ // The video state might have changed *after* a state change (e.g. in Phonon-VLC) // in which case the video related menu actions will not be enabled until // a new state change occurs. By forcing a fake state change we can work around this. - engineStateChanged(videoWindow()->state(), videoWindow()->state()); + engineStateChanged(videoWindow()->state()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dragon-4.10.4/src/app/videoWindow.cpp new/dragon-4.10.90/src/app/videoWindow.cpp --- old/dragon-4.10.4/src/app/videoWindow.cpp 2013-05-28 21:31:12.000000000 +0200 +++ new/dragon-4.10.90/src/app/videoWindow.cpp 2013-06-10 20:54:07.000000000 +0200 @@ -850,6 +850,7 @@ } } + profile.writeEntry( "Date", QDate::currentDate().toString("dd/MM/yyyy") ); profile.sync(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
