Permalink
Browse files

Merge remote branch 'origin/master' into jreen-tpqt4-comp

Conflicts:
	CMakeLists.txt
	src/sip/jreen/jabber_p.cpp
	src/tomahawkapp.cpp
  • Loading branch information...
dschmidt committed Apr 16, 2011
2 parents 3254e60 + 7f570c3 commit 5610abfcde7ef34cef83dfb7ec7ee87b9752f5a9
Showing with 4,924 additions and 1,890 deletions.
  1. +20 −11 CMakeLists.txt
  2. +16 −4 ChangeLog
  3. +13 −91 README
  4. +2 −2 admin/mac/Info.plist
  5. +1 −1 admin/unix/tomahawk.protocol
  6. +1 −1 admin/win/nsi/revision.txt
  7. +1 −1 admin/win/nsi/tomahawk.nsi
  8. BIN data/images/configure.png
  9. +11 −0 data/sql/dbmigrate-22_to_23.sql
  10. +14 −11 include/tomahawk/tomahawkapp.h
  11. +2 −0 resources.qrc
  12. +8 −5 src/CMakeLists.osx.txt
  13. +16 −15 src/CMakeLists.txt
  14. +26 −58 src/audiocontrols.cpp
  15. +4 −5 src/audiocontrols.h
  16. +0 −144 src/infosystem/infosystemcache.cpp
  17. +42 −8 src/libtomahawk/CMakeLists.txt
  18. +2 −2 src/libtomahawk/album.cpp
  19. +1 −1 src/libtomahawk/album.h
  20. +2 −2 src/libtomahawk/artist.cpp
  21. +1 −1 src/libtomahawk/artist.h
  22. +24 −12 src/libtomahawk/audio/audioengine.cpp
  23. +64 −0 src/libtomahawk/audio/dummytranscode.cpp
  24. +63 −0 src/libtomahawk/audio/dummytranscode.h
  25. +2 −0 src/libtomahawk/audio/flactranscode.cpp
  26. +6 −0 src/libtomahawk/audio/vorbistranscode.cpp
  27. +1 −1 src/libtomahawk/database/database.h
  28. +12 −11 src/libtomahawk/database/databasecollection.cpp
  29. +8 −2 src/libtomahawk/database/databasecommand.h
  30. +88 −19 src/libtomahawk/database/databasecommand_allalbums.cpp
  31. +10 −4 src/libtomahawk/database/databasecommand_allalbums.h
  32. +68 −0 src/libtomahawk/database/databasecommand_allartists.cpp
  33. +69 −0 src/libtomahawk/database/databasecommand_allartists.h
  34. +16 −6 src/libtomahawk/database/databasecommand_alltracks.cpp
  35. +2 −2 src/libtomahawk/database/databasecommand_alltracks.h
  36. +6 −22 src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
  37. +20 −8 src/libtomahawk/database/databasecommand_createplaylist.cpp
  38. +8 −8 src/libtomahawk/database/databasecommand_deletefiles.cpp
  39. +2 −2 src/libtomahawk/database/databasecommand_dirmtimes.cpp
  40. +11 −10 src/libtomahawk/database/databasecommand_loadalldynamicplaylists.cpp
  41. +3 −2 src/libtomahawk/database/databasecommand_loadallplaylists.cpp
  42. +3 −1 src/libtomahawk/database/databasecommand_loadops.h
  43. +1 −1 src/libtomahawk/database/databasecommand_loadplaylistentries.h
  44. +1 −0 src/libtomahawk/database/databasecommand_modifyplaylist.cpp
  45. +76 −19 src/libtomahawk/database/databaseimpl.cpp
  46. +5 −3 src/libtomahawk/database/databaseimpl.h
  47. +3 −0 src/libtomahawk/database/databaseworker.cpp
  48. +1 −1 src/libtomahawk/database/fuzzyindex.cpp
  49. +9 −8 src/libtomahawk/database/schema.sql
  50. +4 −5 src/libtomahawk/database/schema.sql.h
  51. +7 −3 src/libtomahawk/functimeout.h
  52. +12 −12 src/{ → libtomahawk}/infosystem/infoplugins/echonestplugin.cpp
  53. +7 −7 src/{ → libtomahawk}/infosystem/infoplugins/echonestplugin.h
  54. +171 −47 src/{ → libtomahawk}/infosystem/infoplugins/lastfmplugin.cpp
  55. +17 −9 src/{ → libtomahawk}/infosystem/infoplugins/lastfmplugin.h
  56. +4 −4 src/{ → libtomahawk}/infosystem/infoplugins/musixmatchplugin.cpp
  57. +7 −6 src/{ → libtomahawk}/infosystem/infoplugins/musixmatchplugin.h
  58. +27 −17 src/{ → libtomahawk}/infosystem/infosystem.cpp
  59. +40 −30 {include/tomahawk → src/libtomahawk/infosystem}/infosystem.h
  60. +216 −0 src/libtomahawk/infosystem/infosystemcache.cpp
  61. +15 −12 src/{ → libtomahawk}/infosystem/infosystemcache.h
  62. +118 −113 src/libtomahawk/kdsingleapplicationguard/kdsingleapplicationguard.cpp
  63. +3 −0 src/libtomahawk/network/bufferiodevice.cpp
  64. +1 −0 src/libtomahawk/network/controlconnection.cpp
  65. +2 −0 src/libtomahawk/network/remotecollection.cpp
  66. +29 −17 src/libtomahawk/network/servent.cpp
  67. +3 −3 src/libtomahawk/network/streamconnection.cpp
  68. +5 −5 src/libtomahawk/pipeline.cpp
  69. +36 −32 src/libtomahawk/playlist.cpp
  70. +10 −4 src/libtomahawk/playlist.h
  71. +7 −6 src/libtomahawk/playlist/albummodel.cpp
  72. +5 −5 src/libtomahawk/playlist/albummodel.h
  73. +11 −4 src/libtomahawk/playlist/albumproxymodel.cpp
  74. +2 −1 src/libtomahawk/playlist/albumproxymodel.h
  75. +13 −2 src/libtomahawk/playlist/albumview.cpp
  76. +2 −1 src/libtomahawk/playlist/albumview.h
  77. +234 −0 src/libtomahawk/playlist/artistview.cpp
  78. +90 −0 src/libtomahawk/playlist/artistview.h
  79. +2 −2 src/libtomahawk/playlist/collectionflatmodel.cpp
  80. +1 −1 src/libtomahawk/playlist/collectionflatmodel.h
  81. +0 −286 src/libtomahawk/playlist/collectionmodel.cpp
  82. +0 −86 src/libtomahawk/playlist/collectionmodel.h
  83. +0 −6 src/libtomahawk/playlist/collectionproxymodel.cpp
  84. +11 −2 src/libtomahawk/playlist/collectionview.cpp
  85. +2 −1 src/libtomahawk/playlist/collectionview.h
  86. +2 −2 src/libtomahawk/playlist/dynamic/DynamicControl.h
  87. +5 −1 src/libtomahawk/playlist/dynamic/DynamicModel.cpp
  88. +1 −1 src/libtomahawk/playlist/dynamic/DynamicModel.h
  89. +93 −92 src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
  90. +31 −30 src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
  91. +27 −27 src/libtomahawk/playlist/dynamic/DynamicView.cpp
  92. +1 −1 src/libtomahawk/playlist/dynamic/DynamicView.h
  93. +2 −0 src/libtomahawk/playlist/dynamic/GeneratorFactory.h
  94. +1 −0 src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp
  95. +2 −2 src/libtomahawk/playlist/dynamic/GeneratorInterface.h
  96. +1 −1 src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp
  97. +3 −1 src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
  98. +1 −0 src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp
  99. +8 −13 src/libtomahawk/playlist/playlistitemdelegate.cpp
  100. +46 −19 src/libtomahawk/playlist/playlistmanager.cpp
  101. +6 −2 src/libtomahawk/playlist/playlistmanager.h
  102. +2 −1 src/libtomahawk/playlist/playlistmodel.cpp
  103. +15 −6 src/libtomahawk/playlist/playlistview.cpp
  104. +2 −1 src/libtomahawk/playlist/playlistview.h
  105. +6 −8 src/libtomahawk/playlist/topbar/topbar.cpp
  106. +2 −15 src/libtomahawk/playlist/trackmodel.cpp
  107. +2 −2 src/libtomahawk/playlist/trackmodel.h
  108. +7 −18 src/libtomahawk/playlist/trackmodelitem.cpp
  109. +0 −3 src/libtomahawk/playlist/trackmodelitem.h
  110. +14 −7 src/libtomahawk/playlist/trackproxymodel.cpp
  111. +2 −1 src/libtomahawk/playlist/trackproxymodel.h
  112. +13 −2 src/libtomahawk/playlist/trackview.cpp
  113. +3 −2 src/libtomahawk/playlist/trackview.h
  114. +145 −0 src/libtomahawk/playlist/treeheader.cpp
  115. +61 −0 src/libtomahawk/playlist/treeheader.h
  116. +119 −0 src/libtomahawk/playlist/treeitemdelegate.cpp
  117. +46 −0 src/libtomahawk/playlist/treeitemdelegate.h
  118. +592 −0 src/libtomahawk/playlist/treemodel.cpp
  119. +134 −0 src/libtomahawk/playlist/treemodel.h
  120. +134 −0 src/libtomahawk/playlist/treemodelitem.cpp
  121. +69 −0 src/libtomahawk/playlist/treemodelitem.h
  122. +164 −0 src/libtomahawk/playlist/treeproxymodel.cpp
  123. +81 −0 src/libtomahawk/playlist/treeproxymodel.h
  124. +28 −21 src/libtomahawk/query.cpp
  125. +116 −0 src/libtomahawk/resolver.cpp
  126. +12 −5 src/libtomahawk/resolver.h
  127. +13 −1 src/libtomahawk/source.cpp
  128. +4 −4 src/libtomahawk/source.h
  129. +28 −12 src/libtomahawk/tomahawksettings.cpp
  130. +27 −24 src/libtomahawk/tomahawksettings.h
  131. +1 −0 src/libtomahawk/utils/querylabel.cpp
  132. +17 −3 src/libtomahawk/utils/tomahawkutils.cpp
  133. +5 −3 src/libtomahawk/utils/tomahawkutils.h
  134. +2 −2 src/libtomahawk/utils/xspfloader.cpp
  135. +1 −1 src/libtomahawk/utils/xspfloader.h
  136. +2 −0 src/libtomahawk/viewpage.h
  137. +3 −3 src/libtomahawk/widgets/newplaylistwidget.cpp
  138. +1 −0 src/libtomahawk/widgets/overlaywidget.cpp
  139. +3 −1 src/libtomahawk/widgets/welcomewidget.cpp
  140. +6 −1 src/main.cpp
  141. +21 −17 src/musicscanner.cpp
  142. +1 −1 src/musicscanner.h
  143. +176 −0 src/resolverconfigdelegate.cpp
  144. +42 −0 src/resolverconfigdelegate.h
  145. +68 −0 src/resolverconfigwrapper.h
  146. +2 −3 src/resolvers/qtscriptresolver.cpp
  147. +4 −3 src/resolvers/qtscriptresolver.h
  148. +53 −9 src/resolvers/scriptresolver.cpp
  149. +7 −1 src/resolvers/scriptresolver.h
  150. +154 −0 src/resolversmodel.cpp
  151. +55 −0 src/resolversmodel.h
  152. +28 −42 src/scanmanager.cpp
  153. +1 −2 src/scanmanager.h
  154. +38 −22 src/scrobbler.cpp
  155. +6 −6 src/scrobbler.h
  156. +46 −34 src/settingsdialog.cpp
  157. +6 −3 src/settingsdialog.h
  158. +7 −29 src/settingsdialog.ui
  159. +12 −2 src/sip/jabber/jabber_p.cpp
  160. +1 −1 src/sip/jreen/jabber_p.cpp
  161. +1 −1 src/sip/twitter/CMakeLists.txt
  162. +2 −0 src/sip/twitter/twitter.cpp
  163. +5 −0 src/sip/twitter/twitter.h
  164. +1 −0 src/sip/twitter/twitterconfigwidget.cpp
  165. +5 −8 src/sip/zeroconf/zeroconf.cpp
  166. +6 −1 src/sip/zeroconf/zeroconf.h
  167. +38 −10 src/sourcetree/sourcesmodel.cpp
  168. +9 −5 src/sourcetree/sourcesmodel.h
  169. +3 −2 src/sourcetree/sourcesproxymodel.cpp
  170. +1 −1 src/sourcetree/sourcesproxymodel.h
  171. +4 −2 src/sourcetree/sourcetreeview.cpp
  172. +5 −6 src/sourcetree/sourcetreeview.h
  173. +53 −45 src/tomahawkapp.cpp
  174. +10 −12 src/tomahawkwindow.cpp
  175. +8 −4 src/web/api_v1.cpp
  176. +2 −3 src/web/api_v1.h
  177. +29 −30 src/xmppbot/xmppbot.cpp
  178. +9 −9 src/xmppbot/xmppbot.h
  179. +2 −0 thirdparty/alsa-playback/CMakeLists.txt
  180. +2 −0 thirdparty/jdns/CMakeLists.txt
  181. +2 −1 thirdparty/liblastfm2/src/scrobble/Audioscrobbler.cpp
  182. +2 −2 thirdparty/liblastfm2/src/types/Track.cpp
  183. +2 −0 thirdparty/libportfwd/CMakeLists.txt
  184. +4 −0 thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
View
@@ -1,6 +1,10 @@
PROJECT( tomahawk )
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+ CMAKE_POLICY(SET CMP0017 NEW)
+ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+
###
### Tomahawk application info
###
@@ -49,35 +53,39 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo
# we need pthreads too
find_package(Threads)
+find_package(KDE4)
+IF(KDE4_FOUND)
+ #KDE4 adds and removes some compiler flags that we don't like
+ STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+ELSE()
+ SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+ENDIF()
+
include( CheckTagLibFileName )
check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
# optional
macro_optional_find_package(Jreen)
IF( NOT LIBJREEN_FOUND )
+ SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
ADD_SUBDIRECTORY( thirdparty/jreen )
SET( LIBJREEN_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
IF( UNIX AND NOT APPLE )
SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.so )
ENDIF( UNIX AND NOT APPLE )
IF( WIN32 )
- SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.dll )
+ SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.dll )
ENDIF( WIN32 )
SET( LIBJREEN_FOUND true )
MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
ENDIF( NOT LIBJREEN_FOUND )
+
IF( WIN32 )
find_library(QTSPARKLE_LIBRARIES qtsparkle)
ENDIF( WIN32 )
-macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP library" "http://gitorious.org/jreen" FALSE "" "Jreen is needed for the alternative/new Jabber SIP plugin. Built automatically inside Tomahawk, if not installed systemwide and ENABLE_JREEN is true")
-
-macro_optional_find_package(Gloox 1.0)
-IF( ENABLE_JREEN )
- set( GLOOX_FOUND false )
-ENDIF( ENABLE_JREEN)
-macro_log_feature(GLOOX_FOUND "Gloox" "A portable high-level Jabber/XMPP library for C++" "http://camaya.net/gloox" FALSE "" "Gloox is needed for the Jabber SIP plugin and the XMPP-Bot")
#show dep log
macro_display_feature_log()
MESSAGE("WARNING!")
@@ -94,9 +102,10 @@ CONFIGURE_FILE(
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
-ADD_CUSTOM_TARGET(uninstall
- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
+# KDE4 defines an uninstall target for us automatically
+IF( NOT KDE4_FOUND )
+ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ENDIF()
IF( NOT APPLE )
# Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
View
@@ -1,12 +1,24 @@
Version 0.1.0:
+ * Resolvers can now be enabled and disabled, and some can be configured
+ directly in Tomahawk.
+ * Browse and play collections in our snappy tree-view, which also shows
+ images for artists and albums.
* Watch folders for changes and automatically update your collection. This
is on by default; you can turn it off on the Local Music tab in the
- settings dialog. Note that this triggers only on files or folders being
+ settings dialog. Note that this triggers only on files or folders being
added to or removed from folders; it is not watch individual files as
most OSes can't support enough file watches to handle a normal-sized
music collection.
+Version 0.0.4:
+ * Fixed crash that could occur when playing a track from a browser.
+ * Fixed a crash situation caused by sources going on- or offline.
+
Version 0.0.3:
+ * Show spinner while resolving playlists.
+ * Go back to previous page visible when deleting a playlist.
+ * Fixed issue where automatic playlists and station summaries were not
+ updated in the playlist header.
* Fixed an issue which caused duplicate items when rescanning.
* Revert change introduced in 0.0.2 causing Twitter protocol to not try
to reconnect to a peer if it couldn't connect the first time the plugin
@@ -17,9 +29,10 @@ Version 0.0.3:
* Don't automatically try to resolve all incoming playback logs. This
speeds up importing sources a lot.
* Faster painting of playlists with lots of unresolved tracks.
- * The tomahawk:// protocol handler works on Windows now.
- * Fixed launching Tomahawk from Windows installer with admin privileges.
* Prefer local results when results' score is equal.
+ * (Windows) The tomahawk:// protocol handler works on Windows now.
+ * (Windows) Fixed launching Tomahawk from Windows installer with admin privileges.
+ * (Windows) Prevent launching a second instance on Windows.
Version 0.0.2:
* Don't reconnect to Jabber if the settings dialog is closed successfully
@@ -35,7 +48,6 @@ Version 0.0.2:
the Tomahawk XMPP presence.
* Incompatible change: Twitter SIP protocol has changed slightly. 0.0.1
clients will not be able to talk to newer clients.
- * Hopefully fixed crashes during Twitter authentication.
* Don't let long playlist or summary names force a large Tomahawk window.
* Tomahawk now asks you to authorize new contacts.
View
104 README
@@ -1,82 +1,23 @@
-Quickstart on Ubuntu
---------------------
-
- $ sudo apt-get install build-essential cmake libtag1c2a libtag1-dev libqt4-dev libqt4-sql-sqlite \
- libvorbis-dev libmad0-dev libflac++-dev libasound2-dev libboost-dev zlib1g-dev \
- libgnutls-dev pkg-config
-
-
-Gloox 1.0 (XMPP library)
-------------------------
- On Ubuntu 10.10 (and higher):
- $ sudo apt-get install libgloox-dev
-
- Otherwise see: http://camaya.net/glooxdownload
- You need to build gloox 1.0 from source, Ubuntu 10.04 only packages version 0.9.
-
- Download and unpack tarball:
- $ ./configure --without-openssl --with-gnutls --without-libidn --with-zlib --without-examples --without-tests
- $ CXXFLAGS=-fPIC make
- $ sudo make install
-
-QJson (Qt JSON library)
------------------------
- On Ubuntu 10.04 (and higher):
- $ sudo apt-get install libqjson-dev
-
- Otherwise see: http://sourceforge.net/projects/qjson/files/ (developed using version 0.7.1)
-
- Download and unpack tarball:
- $ ./configure && make
- $ sudo make install
-
-libEchonest 1.1.4
----------------
- See: http://projects.kde.org/projects/playground/libs/libechonest/
+Compiling Tomahawk
+------------------
- Download and unpack tarball:
$ mkdir build && cd build
$ cmake ..
$ make
- $ sudo make install
-CLucene 0.9.23
----------------
- See: http://clucene.sourceforge.net/download.shtml
-
- Clone from git and build CLucene:
- $ git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene
- $ cd clucene && mkdir build && cd build
- $ cmake ..
- $ make
- $ sudo make install
-
-
-Quickstart on OS X
-------------------
-
- Install homebrew
- $ ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"
- $ brew install cmake qt qjson gloox libmad libvorbis flac taglib boost
-
- Install libEchnoest & CLucene as per the above instructions.
+ Start the application on Linux:
+ $ ./tomahawk
+ Start the application on OS X:
+ $ open tomahawk.app
- If liblastfm gives problems, do the below:
- $ brew edit liblastfm
- Change the url to https://github.com/davidsansome/liblastfm/tarball/0.3.1
- $ brew install liblastfm
- Copy the md5 hash it returns.
- $ brew edit liblastfm
- Replace the md5 hash with the new one you copied.
- $ brew install liblastfm
+Detailed building instructions for Ubuntu
+-----------------------------------------
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Maverick_(10.10)
-Now compile Tomahawk
---------------------
- $ mkdir build && cd build
- $ cmake ..
- $ make
- $ ./tomahawk
+Detailed building instructions for OS X
+---------------------------------------
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)
Dependencies
@@ -85,7 +26,7 @@ Dependencies
CMake 2.8.0 http://www.cmake.org/
Qt 4.7.0 http://qt.nokia.com/
QJson 0.7.1 http://qjson.sourceforge.net/
- Gloox 1.0 (0.9.x will fail) http://camaya.net/gloox/
+ Gloox 1.0 http://camaya.net/gloox/
SQLite 3.6.22 http://www.sqlite.org/
TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
Boost 1.3x http://www.boost.org/
@@ -102,23 +43,4 @@ Dependencies
MiniUPnP http://miniupnp.free.fr/
liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
-
-To build the app:
------------------
- $ mkdir build && cd build
- $ cmake ..
- $ make
-
-To run the app:
----------------
- Only run the next two commands if you installed any of the dependencies from source on Linux.
- $ export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
- $ sudo ldconfig -v
-
- Start the application on Linux:
- $ ./tomahawk
-
- Start the application on OS X:
- $ open tomahawk.app
-
Enjoy!
View
@@ -13,9 +13,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleVersion</key>
- <string>0.0.2.0</string>
+ <string>TOMAHAWK_VERSION</string>
<key>CFBundleShortVersionString</key>
- <string>0.0.2</string>
+ <string>TOMAHAWK_VERSION</string>
<key>CFBundleSignature</key>
<string>tomahawk</string>
<key>CFBundleIconFile</key>
@@ -1,5 +1,5 @@
[Protocol]
-exec=/home/leo/kde/tomahawk/build/tomahawk "%u"
+exec=/path/to/binary "%u"
protocol=tomahawk
input=none
output=none
@@ -1 +1 @@
-100
+103
@@ -9,7 +9,7 @@
!define OPTION_SECTION_SC_DESKTOP
!define OPTION_SECTION_SC_QUICK_LAUNCH
!define OPTION_FINISHPAGE
-;!define OPTION_FINISHPAGE_LAUNCHER
+!define OPTION_FINISHPAGE_LAUNCHER
!define OPTION_FINISHPAGE_RELEASE_NOTES
;-----------------------------------------------------------------------------
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,11 @@
+-- Script to migate from db version 22 to 23.
+-- Only change in this version is that playlists gained a createdOn date.
+-- Set all playlists to created to now.
+--
+-- Separate each command with %%
+
+ALTER TABLE playlist ADD COLUMN createdOn INTEGER NOT NULL DEFAULT 0;
+
+UPDATE playlist SET createdOn = strftime( '%s','now' );
+
+UPDATE settings SET v = '23' WHERE k == 'schema_version';
@@ -1,5 +1,5 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
+ *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
@@ -44,6 +44,7 @@
class AudioEngine;
class Database;
+class ScanManager;
class SipHandler;
class TomahawkSettings;
class XMPPBot;
@@ -78,30 +79,31 @@ Q_OBJECT
TomahawkApp( int& argc, char *argv[] );
virtual ~TomahawkApp();
+ void init();
static TomahawkApp* instance();
SipHandler* sipHandler() { return m_sipHandler; }
- Tomahawk::InfoSystem::InfoSystem* infoSystem() { return m_infoSystem; }
XMPPBot* xmppBot() { return m_xmppBot; }
#ifndef TOMAHAWK_HEADLESS
AudioControls* audioControls();
TomahawkWindow* mainWindow() const { return m_mainwindow; }
#endif
- void addScriptResolver( const QString& scriptPath );
- void removeScriptResolver( const QString& scriptPath );
+ void enableScriptResolver( const QString& scriptPath );
+ void disableScriptResolver( const QString& scriptPath );
+ Tomahawk::ExternalResolver* resolverForPath( const QString& scriptPath );
// PlatformInterface
virtual void activate();
virtual bool loadUrl( const QString& url );
// because QApplication::arguments() is expensive
bool scrubFriendlyName() const { return m_scrubFriendlyName; }
-
+
public slots:
void instanceStarted( KDSingleApplicationGuard::Instance );
-
+
private slots:
void setupSIP();
@@ -115,30 +117,31 @@ private slots:
void startHTTP();
QList<Tomahawk::collection_ptr> m_collections;
- QList<Tomahawk::ExternalResolver*> m_scriptResolvers;
+ QHash<QString, Tomahawk::ExternalResolver*> m_scriptResolvers;
Database* m_database;
+ ScanManager *m_scanManager;
AudioEngine* m_audioEngine;
SipHandler* m_sipHandler;
Servent* m_servent;
+ Tomahawk::InfoSystem::InfoSystem* m_infoSystem;
XMPPBot* m_xmppBot;
Tomahawk::ShortcutHandler* m_shortcutHandler;
bool m_scrubFriendlyName;
-
+
#ifdef LIBLASTFM_FOUND
Scrobbler* m_scrobbler;
#endif
#ifndef TOMAHAWK_HEADLESS
TomahawkWindow* m_mainwindow;
-#endif
+#endif
bool m_headless;
- Tomahawk::InfoSystem::InfoSystem* m_infoSystem;
-
QxtHttpServerConnector m_connector;
QxtHttpSessionManager m_session;
};
#endif // TOMAHAWKAPP_H
+
View
@@ -74,6 +74,7 @@
<file>./data/images/back.png</file>
<file>./data/images/forward.png</file>
<file>./data/images/music-icon.png</file>
+<file>./data/images/configure.png</file>
<file>./data/topbar-radiobuttons.css</file>
<file>./data/icons/tomahawk-icon-16x16.png</file>
<file>./data/icons/tomahawk-icon-32x32.png</file>
@@ -87,5 +88,6 @@
<file>./data/www/auth.html</file>
<file>./data/www/auth.na.html</file>
<file>./data/www/tomahawk_banner_small.png</file>
+<file>./data/sql/dbmigrate-22_to_23.sql</file>
</qresource>
</RCC>
Oops, something went wrong.

0 comments on commit 5610abf

Please sign in to comment.