From 47a92664df7d5726421efe19e256a3cf655c812a Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 13 Aug 2011 21:51:31 +0200 Subject: [PATCH 1/6] Recover from apachalogger's "fixes" :P --- CMakeLists.txt | 2 +- CPack.cmake => TomahawkCPack.cmake | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename CPack.cmake => TomahawkCPack.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a1c02513..1a7e0f463 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) # installer creation -INCLUDE( CPack ) +INCLUDE( TomahawkCPack.cmake ) #deps INCLUDE( MacroOptionalFindPackage ) diff --git a/CPack.cmake b/TomahawkCPack.cmake similarity index 100% rename from CPack.cmake rename to TomahawkCPack.cmake From e367e49039195409b9589c3c60ae79af6318ccd2 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 13 Aug 2011 16:07:42 -0400 Subject: [PATCH 2/6] Remove assertion---happens easily on shutdown if you quit too early while tomahawk is loading, and i've never seen it otherwise. --- src/libtomahawk/sourcelist.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libtomahawk/sourcelist.cpp b/src/libtomahawk/sourcelist.cpp index 7827bba48..ab222eeae 100644 --- a/src/libtomahawk/sourcelist.cpp +++ b/src/libtomahawk/sourcelist.cpp @@ -134,8 +134,6 @@ SourceList::add( const source_ptr& source ) void SourceList::removeAllRemote() { - Q_ASSERT( m_isReady ); - foreach( const source_ptr& s, m_sources ) { qDebug() << "Disconnecting" << s->friendlyName() << s->isLocal() << s->controlConnection() << s->isOnline(); From e6bb2877ee39016872e67d667395e9a2665b0a38 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 13 Aug 2011 22:11:10 +0200 Subject: [PATCH 3/6] Fix building installers for windows --- CMakeModules/NSIS.template.in | 15 +++++++------- admin/win/update-vlc.sh | 38 +++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in index db9e814c8..959810a9d 100644 --- a/CMakeModules/NSIS.template.in +++ b/CMakeModules/NSIS.template.in @@ -28,10 +28,11 @@ ; We use official release plugins ; mingw32-vlc from obs misses a lot and has even broken ones probably -!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc" ; SIC! ^ -!define VLC_PLUGIN_PATH "${VLC_PATH}\plugins" +!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^ +!define VLC_BIN "${VLC_PATH}\bin" +!define VLC_PLUGIN_PATH "${VLC_BIN}\plugins" -!define NSI_PATH "@CMAKE_SOURCE_DIR@/admin/win/nsi" +!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi" ;----------------------------------------------------------------------------- ; Increment installer revision number as part of this script. @@ -333,15 +334,15 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${MING_BIN}\libdbus-1-3.dll" File "${MING_BIN}\dbus-daemon.exe" - File "${MING_BIN}\libphonon.dll" + File "${VLC_BIN}\libphonon.dll" SetOutPath "$INSTDIR\phonon_backend" - File "${VLC_PATH}\phonon_backend\phonon_vlc.dll" + File "${VLC_BIN}\phonon_backend\phonon_vlc.dll" SetOutPath "$INSTDIR" ;VLC ;SetOutPath "$INSTDIR\phonon_backend" - File "${VLC_PATH}\libvlc.dll" - File "${VLC_PATH}\libvlccore.dll" + File "${VLC_BIN}\libvlc.dll" + File "${VLC_BIN}\libvlccore.dll" SetOutPath "$INSTDIR\plugins" File /r "${VLC_PLUGIN_PATH}\*.dll" SetOutPath "$INSTDIR" diff --git a/admin/win/update-vlc.sh b/admin/win/update-vlc.sh index 1a0e456f5..c2f3a0a46 100644 --- a/admin/win/update-vlc.sh +++ b/admin/win/update-vlc.sh @@ -1,19 +1,45 @@ #!/bin/bash echo "Remove old vlc dir..." + +mkdir -p vlc/ +cd vlc/ + #rm -vf vlc-*.7z -rm -rf vlc/ +#rm -rf vlc/ echo "Download specified binary..." #wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb" -wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip" +#wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip" +wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z echo "Extract binary..." -#7z x vlc-*.7z +7z x phonon-vlc-last.7z #mv -v vlc-*/ vlc/ -unzip tomahawk-vlc-0.1.zip +#unzip tomahawk-vlc-0.1.zip -#echo "Strip unneeded plugins from vlc/plugins..." -# cd vlc/plugins/ +echo "Strip unneeded plugins from vlc/plugins..." +cd prefix/bin/plugins +rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \ + libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \ + *qt4* *skins2* libaccess_bd_plugin.dll \ + libaudiobargraph_* libball_plugin.dll \ + libdirac_plugin.dll \ + libgnutls_plugin.dll \ + libcaca_plugin.dll \ + libfreetype_plugin.dll \ + libaccess_output_shout_plugin.dll \ + libremoteosd_plugin.dll \ + libsdl_image_plugin.dll \ + libvout_sdl_plugin.dll \ + libpng_plugin.dll \ + libgoom_plugin.dll \ + libatmo_plugin.dll \ + libmux_ts_plugin.dll \ + libkate_plugin.dll \ + libtaglib_plugin.dll + + +# this is for vlc-1.2 # rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \ # */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub* \ # services_discover/ visualization/ control/ misc/ From 999b9bae2214dc84ad211400daa179ce64b778cc Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 13 Aug 2011 22:42:08 +0200 Subject: [PATCH 4/6] Restructure version string generation --- CMakeLists.txt | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a7e0f463..4439bbe4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,26 +23,28 @@ SET( TOMAHAWK_VERSION_RC 1 ) # build options option(BUILD_GUI "Build Tomahawk with GUI" ON) - +option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF) # generate version string -IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) - # Use the date as the tweak level. - INCLUDE( CMakeDateStamp ) - SET( TOMAHAWK_VERSION_TWEAK "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) - INCLUDE( CMakeVersionSource ) -ENDIF() +# base string used in release and unstable builds SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} ) - -IF( ${TOMAHAWK_VERSION_TWEAK} GREATER 0) - SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_TWEAK} ) -ENDIF() IF( TOMAHAWK_VERSION_RC ) - SET( CMake_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} ) + SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} ) ENDIF() -IF( CMAKE_VERSION_SOURCE ) - SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} ) + +# additional info for non-release builds +IF( NOT BUILD_RELEASE ) + IF( ${TOMAHAWK_VERSION_TWEAK} GREATER 0) + SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} ) + ENDIF() + + INCLUDE( CMakeDateStamp ) + SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) + INCLUDE( CMakeVersionSource ) + IF( CMAKE_VERSION_SOURCE ) + SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} ) + ENDIF() ENDIF() From a7a4b97df8e1d25e04b382850d9699b2b4fe2df5 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 13 Aug 2011 22:56:40 +0200 Subject: [PATCH 5/6] * Fixed TWK-362: Only display other albums on album page. --- .../database/databasecommand_allalbums.h | 3 ++- src/libtomahawk/playlist/albummodel.cpp | 1 - .../widgets/infowidgets/AlbumInfoWidget.cpp | 24 +++++++++++++++---- .../widgets/infowidgets/AlbumInfoWidget.h | 2 ++ src/libtomahawk/widgets/welcomewidget.cpp | 1 - 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_allalbums.h b/src/libtomahawk/database/databasecommand_allalbums.h index 8520e0d07..8a13ea576 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.h +++ b/src/libtomahawk/database/databasecommand_allalbums.h @@ -38,7 +38,7 @@ public: ModificationTime = 1 }; - explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection, const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 ) + explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 ) : DatabaseCommand( parent ) , m_collection( collection ) , m_artist( artist ) @@ -55,6 +55,7 @@ public: void execForCollection( DatabaseImpl* ); void execForArtist( DatabaseImpl* ); + void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; } void setLimit( unsigned int amount ) { m_amount = amount; } void setSortOrder( DatabaseCommand_AllAlbums::SortOrder order ) { m_sortOrder = order; } void setSortDescending( bool descending ) { m_sortDescending = descending; } diff --git a/src/libtomahawk/playlist/albummodel.cpp b/src/libtomahawk/playlist/albummodel.cpp index 972ac372f..7d31ebd14 100644 --- a/src/libtomahawk/playlist/albummodel.cpp +++ b/src/libtomahawk/playlist/albummodel.cpp @@ -355,7 +355,6 @@ void AlbumModel::infoSystemFinished( QString target ) { Q_UNUSED( target ); -// qDebug() << Q_FUNC_INFO; } diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 6e9dc8374..cd0073c31 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -20,6 +20,7 @@ #include "ui_AlbumInfoWidget.h" #include "viewmanager.h" +#include "database/database.h" #include "playlist/treemodel.h" #include "playlist/albummodel.h" @@ -39,7 +40,6 @@ using namespace Tomahawk; AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* parent ) : QWidget( parent ) , ui( new Ui::AlbumInfoWidget ) - , m_album( album ) { ui->setupUi( this ); @@ -77,13 +77,18 @@ AlbumInfoWidget::~AlbumInfoWidget() void AlbumInfoWidget::load( const album_ptr& album ) { + m_album = album; m_title = album->name(); m_description = album->artist()->name(); m_tracksModel->addTracks( album, QModelIndex() ); - QList al; - al << album; - m_albumsModel->addAlbums( al ); + DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums(); + cmd->setArtist( album->artist() ); + + connect( cmd, SIGNAL( albums( QList, QVariant ) ), + SLOT( gotAlbums( QList ) ) ); + + Database::instance()->enqueue( QSharedPointer( cmd ) ); Tomahawk::InfoSystem::InfoCriteriaHash trackInfo; trackInfo["artist"] = album->artist()->name(); @@ -99,6 +104,17 @@ AlbumInfoWidget::load( const album_ptr& album ) } +void +AlbumInfoWidget::gotAlbums( const QList& albums ) +{ + QList al = albums; + if ( al.contains( m_album ) ) + al.removeAll( m_album ); + + m_albumsModel->addAlbums( al ); +} + + void AlbumInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ) { diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h index 9975ff522..3d52efa19 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -86,6 +86,8 @@ protected: void changeEvent( QEvent* e ); private slots: + void gotAlbums( const QList& albums ); + void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ); void infoSystemFinished( QString target ); diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index fe1efb762..fb2b6e66c 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -294,7 +294,6 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, painter->restore(); } - QPixmap avatar = index.data( WelcomePlaylistModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar( Source::FancyStyle ); if ( avatar.isNull() ) avatar = m_defaultAvatar; From 968bee2a621a1f58591cc87aa2ec10e20ffbccce Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 13 Aug 2011 23:00:00 +0200 Subject: [PATCH 6/6] Gooooood mooooorniiiing, viiieeetnaaam! --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4439bbe4f..460e86fe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,12 +35,12 @@ ENDIF() # additional info for non-release builds IF( NOT BUILD_RELEASE ) - IF( ${TOMAHAWK_VERSION_TWEAK} GREATER 0) + INCLUDE( CMakeDateStamp ) + SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) + IF( ${TOMAHAWK_VERSION_DATE} GREATER 0) SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} ) ENDIF() - INCLUDE( CMakeDateStamp ) - SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) INCLUDE( CMakeVersionSource ) IF( CMAKE_VERSION_SOURCE ) SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )