mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master' into osxrelesae

Browse Source
This commit is contained in:
Leo Franchi
2011-05-07 18:34:35 -04:00
parent 9944534581 e8430e0501
commit 2c08d2d186
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -45,7 +45,7 @@ else()
message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4") message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
endif() endif()
macro_optional_find_package(LibEchonest 1.1.1) macro_optional_find_package(LibEchonest 1.1.5)
macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest is needed for dynamic playlists and the infosystem") macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest is needed for dynamic playlists and the infosystem")
macro_optional_find_package(CLucene 0.9.23) macro_optional_find_package(CLucene 0.9.23)

2
README
View File

@@ -31,7 +31,7 @@ Dependencies
TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
Boost 1.3x http://www.boost.org/ Boost 1.3x http://www.boost.org/
CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
libechonest 1.1.4 http://projects.kde.org/projects/playground/libs/libechonest/ libechonest 1.1.5 http://projects.kde.org/projects/playground/libs/libechonest/
Third party libraries that we ship with our source: Third party libraries that we ship with our source:

6
resources.qrc
View File

@@ -15,10 +15,8 @@
<file>./data/images/pause-rest.png</file> <file>./data/images/pause-rest.png</file>
<file>./data/images/play-pressed.png</file> <file>./data/images/play-pressed.png</file>
<file>./data/images/play-rest.png</file> <file>./data/images/play-rest.png</file>
<file>data/images/sipplugin-add.png</file> <file>./data/images/sipplugin-add.png</file>
<file>data/images/seek-slider-level.png</file> <file>./data/images/sipplugin-remove.png</file>
<file>data/images/shuffle-off-rest.png</file>
<file>data/images/sipplugin-remove.png</file>
<file>./data/images/playlist-icon.png</file> <file>./data/images/playlist-icon.png</file>
<file>./data/images/repeat-1-on-pressed.png</file> <file>./data/images/repeat-1-on-pressed.png</file>
<file>./data/images/repeat-1-on-rest.png</file> <file>./data/images/repeat-1-on-rest.png</file>

6
src/libtomahawk/database/databaseimpl.cpp
View File

@@ -553,8 +553,8 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
else else
{ {
// Q_ASSERT( false ); // Q_ASSERT( false );
// qDebug() << "We don't support non-servent / non-file result-hints yet."; qDebug() << "We don't support non-servent / non-file result-hints yet.";
res = Tomahawk::result_ptr( new Tomahawk::Result() ); /* res = Tomahawk::result_ptr( new Tomahawk::Result() );
s = SourceList::instance()->webSource(); s = SourceList::instance()->webSource();
res->setUrl( url ); res->setUrl( url );
res->setCollection( s->collection() ); res->setCollection( s->collection() );
@@ -565,7 +565,7 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
res->setTrack( origquery->track() ); res->setTrack( origquery->track() );
res->setDuration( origquery->duration() ); res->setDuration( origquery->duration() );
res->setFriendlySource( url ); res->setFriendlySource( url );
return res; return res;*/
} }
res = Tomahawk::result_ptr( new Tomahawk::Result() ); res = Tomahawk::result_ptr( new Tomahawk::Result() );

2
src/libtomahawk/tomahawksettings.cpp
View File

@@ -177,7 +177,7 @@ TomahawkSettings::hasScannerPaths() const
bool bool
TomahawkSettings::watchForChanges() const TomahawkSettings::watchForChanges() const
{ {
return value( "watchForChanges", true ).toBool(); return value( "watchForChanges", false ).toBool();
} }

5
src/settingsdialog.cpp
View File

@@ -102,6 +102,11 @@ SettingsDialog::SettingsDialog( QWidget *parent )
//FIXME: MULTIPLECOLLECTIONDIRS //FIXME: MULTIPLECOLLECTIONDIRS
if ( s->scannerPaths().count() ) if ( s->scannerPaths().count() )
ui->lineEditMusicPath_2->setText( s->scannerPaths().first() ); ui->lineEditMusicPath_2->setText( s->scannerPaths().first() );
else
{
ui->lineEditMusicPath_2->setText( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) );
}
ui->checkBoxWatchForChanges->setChecked( s->watchForChanges() ); ui->checkBoxWatchForChanges->setChecked( s->watchForChanges() );
// LAST FM // LAST FM

2
src/tomahawkwindow.cpp
View File

@@ -151,7 +151,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
toolbar->installEventFilter( new WidgetDragFilter( toolbar ) ); toolbar->installEventFilter( new WidgetDragFilter( toolbar ) );
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
ui->menuHelp->insertSeparator( 1 ); ui->menu_Help->insertSeparator( ui->actionAboutTomahawk );
#endif #endif
#if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE ) #if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE )