mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +02:00
Code Issues Releases Wiki Activity

* Merged stable.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-04-04 10:55:58 +02:00
parent 16fd65667f 60b9d48d73
commit 92bc03ee3e
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
SET( ORGANIZATION_NAME "Tomahawk" ) SET( ORGANIZATION_NAME "Tomahawk" )
SET( ORGANIZATION_DOMAIN "tomahawk-player.org" ) SET( ORGANIZATION_DOMAIN "tomahawk-player.org" )
SET( APPLICATION_NAME "Tomahawk" ) SET( APPLICATION_NAME "Tomahawk" )
SET( VERSION "0.0.2" ) SET( VERSION "0.0.3" )
# set paths # set paths

3
ChangeLog
View File

@@ -7,6 +7,7 @@ Version 0.1.0:
music collection. music collection.
Version 0.0.3: Version 0.0.3:
* Fixed an issue which caused duplicate items when rescanning.
* Fix crashes in Twitter authentication. * Fix crashes in Twitter authentication.
* Properly honor the chosen port number if a static host and port are * Properly honor the chosen port number if a static host and port are
marked as preferred. marked as preferred.
@@ -14,7 +15,7 @@ Version 0.0.3:
speeds up importing sources a lot. speeds up importing sources a lot.
* Faster painting of playlists with lots of unresolved tracks. * Faster painting of playlists with lots of unresolved tracks.
* The tomahawk:// protocol handler works on Windows now. * The tomahawk:// protocol handler works on Windows now.
* Fixed launching Tomahawk from Installer with administrative permissions. * Fixed launching Tomahawk from Windows installer with admin privileges.
* Prefer local results when results' score is equal. * Prefer local results when results' score is equal.
Version 0.0.2: Version 0.0.2:

2
admin/win/nsi/revision.txt Executable file → Normal file
View File

@@ -1 +1 @@
97 100

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

@@ -35,7 +35,7 @@
!define VER_MAJOR "0" !define VER_MAJOR "0"
!define VER_MINOR "0" !define VER_MINOR "0"
!define VER_BUILD "2" !define VER_BUILD "3"
!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}" !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"

8
src/libtomahawk/database/databasecommand_dirmtimes.cpp
View File

@@ -53,12 +53,14 @@ DatabaseCommand_DirMtimes::execSelect( DatabaseImpl* dbi )
} }
void void
DatabaseCommand_DirMtimes::execSelectPath( DatabaseImpl *dbi, QString &path, QMap<QString, unsigned int> &mtimes ) DatabaseCommand_DirMtimes::execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes )
{ {
TomahawkSqlQuery query = dbi->newquery(); TomahawkSqlQuery query = dbi->newquery();
query.prepare( QString( "SELECT name, mtime " query.prepare( QString( "SELECT name, mtime "
"FROM dirs_scanned " "FROM dirs_scanned "
"WHERE name LIKE '%1%'" ).arg( path.replace( '\'',"''" ) ) ); "WHERE name LIKE :prefix" ) );
query.bindValue( ":prefix", path.absolutePath() + "%" );
query.exec(); query.exec();
while( query.next() ) while( query.next() )

4
src/libtomahawk/database/databasecommand_dirmtimes.h
View File

@@ -34,7 +34,7 @@ class DLLEXPORT DatabaseCommand_DirMtimes : public DatabaseCommand
Q_OBJECT Q_OBJECT
public: public:
explicit DatabaseCommand_DirMtimes( const QString& prefix = "", QObject* parent = 0 ) explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 )
: DatabaseCommand( parent ), m_prefix( prefix ), m_update( false ) : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false )
{} {}
@@ -56,7 +56,7 @@ signals:
public slots: public slots:
private: private:
void execSelectPath( DatabaseImpl *dbi, QString &path, QMap<QString, unsigned int> &mtimes ); void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes );
void execSelect( DatabaseImpl* dbi ); void execSelect( DatabaseImpl* dbi );
void execUpdate( DatabaseImpl* dbi ); void execUpdate( DatabaseImpl* dbi );

4
src/libtomahawk/playlist/trackmodel.cpp
View File

@@ -303,7 +303,7 @@ TrackModel::removeIndex( const QModelIndex& index, bool moreToCome )
{ {
if ( QThread::currentThread() != thread() ) if ( QThread::currentThread() != thread() )
{ {
qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO; // qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
QMetaObject::invokeMethod( this, "removeIndex", QMetaObject::invokeMethod( this, "removeIndex",
Qt::QueuedConnection, Qt::QueuedConnection,
Q_ARG(const QModelIndex, index), Q_ARG(const QModelIndex, index),
@@ -312,8 +312,6 @@ TrackModel::removeIndex( const QModelIndex& index, bool moreToCome )
return; return;
} }
qDebug() << Q_FUNC_INFO;
if ( index.column() > 0 ) if ( index.column() > 0 )
return; return;