mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-14 04:51:53 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master' into liblastfm2

Browse Source
This commit is contained in:
Jeff Mitchell 2011-03-25 09:40:56 -04:00
commit 6b1bb4da61
12 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AUTHORS Normal file
View File

@ -0,0 +1,16 @@
Tomahawk is primarily authored by:
* Christian Muehlhaeuser <muesli@tomahawk-player.org>
Contributors include:
* Leo Franchi <lfranchi@kde.org>
* Dominik Schmidt <dev@dominik-schmidt.de>
* Jeff Mitchell <mitchell@kde.org>
* J Herskowitz <jherskow@gmail.com>
* Alejandro Wainzinger <aikawarazuni@gmail.com>
Thanks to:
* Harald Sitter <sitter@kde.org>
* Steve Robertson

3
ChangeLog
View File

@ -1,3 +1,2 @@
Version 0.0.1:
Features:
* Knocks your socks off
* First public release.

2
admin/mac/sparkle-beta.rss
View File

@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle-debug/updates/tomahawk0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
<enclosure url="http://download.tomahawk-player.org/sparkle-debug/updates/tomahawk-beta-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
</item>
</channel>
</rss>

1
admin/win/Toolchain-mingw32-openSUSE.cmake
View File

@ -17,3 +17,4 @@ SET(WINDRES_EXECUTABLE /usr/bin/i686-w64-mingw32-windres)
# libs with broken find modules
SET(TAGLIB_FOUND true)
SET(TAGLIB_LIBRARIES ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
SET(TAGLIB_INCLUDES ${CMAKE_FIND_ROOT_PATH}/include/taglib)

2
admin/win/nsi/revision.txt
View File

@ -1 +1 @@
85
94

8
admin/win/nsi/tomahawk.nsi
View File

@ -23,6 +23,7 @@
!define BUILD_PATH "${ROOT_PATH}\build"
!define QT_DLL_PATH "${MING_BIN}"
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
;-----------------------------------------------------------------------------
; Increment installer revision number as part of this script.
@ -292,6 +293,12 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
SetOutPath "$INSTDIR\sqldrivers"
File "${SQLITE_DLL_PATH}\qsqlite4.dll"
SetOutPath "$INSTDIR"
;Image plugins
SetOutPath "$INSTDIR\imageformats"
File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
SetOutPath "$INSTDIR"
;Cygwin/c++ stuff
;File "${MING_DLL_PATH}\cygmad-0.dll"
@ -313,6 +320,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${MING_DLL_PATH}\libtag.dll"
File "${MING_DLL_PATH}\libgloox-8.dll"
File "${MING_DLL_PATH}\libpng15-15.dll"
File "${MING_DLL_PATH}\libjpeg-8.dll"
File "${MING_DLL_PATH}\zlib1.dll"
File "${MING_DLL_PATH}\libechonest.dll"

2
admin/win/sparklewin-beta.rss
View File

@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk0.0.1.exe" sparkle:version="0.0.1" />
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
</item>
</channel>
</rss>

2
admin/win/sparklewin.rss
View File

@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk0.0.1.exe" sparkle:version="0.0.1" />
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-0.0.1.exe" sparkle:version="0.0.1" />
</item>
</channel>
</rss>

4
src/CMakeLists.txt
View File

@ -138,11 +138,10 @@ INCLUDE_DIRECTORIES(
${THIRDPARTY_DIR}/alsa-playback
${THIRDPARTY_DIR}/rtaudio
${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb/
${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb
${THIRDPARTY_DIR}/qtweetlib/qtweetlib/src
${THIRDPARTY_DIR}/qtweetlib/tomahawk-custom
${TAGLIB_INCLUDES}
${QJSON_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}
@ -169,6 +168,7 @@ IF( APPLE )
ENDIF( APPLE )
IF(GLOOX_FOUND)
INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
ENDIF(GLOOX_FOUND)

1
src/libtomahawk/widgets/welcomewidget.cpp
View File

@ -41,6 +41,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
ui->setupUi( this );
ui->playlistWidget->setItemDelegate( new PlaylistDelegate() );
ui->playlistWidget->overlay()->resize( 380, 86 );
ui->tracksView->overlay()->setEnabled( false );
m_tracksModel = new PlaylistModel( ui->tracksView );

2
src/sip/jabber/jabber_p.cpp
View File

@ -158,7 +158,7 @@ Jabber_p::go()
m_client->disco()->addFeature( "tomahawk:player" );
*/
m_client->setPresence( Presence::Available, 1, "Tomahawk available" );
m_client->setPresence( Presence::XA, -127, "Tomahawk available" );
// m_client->connect();
// return;

1
thirdparty/qtweetlib/CMakeLists.txt vendored
View File

@ -181,6 +181,7 @@ endif(APPLE)
target_link_libraries(tomahawk_qtweetlib
${QT_LIBRARIES}
${QJSON_FLAGS}
${QJSON_LIBRARIES}
)
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )