Leo Franchi
19fe8217c6
Merge branch 'master' into dynamic
...
use ints instead of enums for properties
only connect to dynamic playlist revision changes signal
Conflicts:
src/CMakeLists.txt
src/libtomahawk/database/databaseimpl.cpp
src/libtomahawk/database/schema.sql
src/libtomahawk/database/schema.sql.h
src/libtomahawk/playlist.h
src/libtomahawk/result.h
src/playlist/playlistmanager.cpp
src/tomahawkwindow.cpp
2011-01-09 11:11:32 -05:00
Christian Muehlhaeuser
18d5d43695
* Temporary fix for infinite loop inside FLAC transcoder.
2011-01-09 10:57:30 +01:00
Christian Muehlhaeuser
3eeec206f1
* Fixed crash in DbSyncConnection.
2011-01-09 07:42:31 +01:00
Christian Muehlhaeuser
3061a95cb1
* Introduced result-hints for static playlists. Speeds up resolving - lots. It will also preserve whichever result you prefer for a query.
...
* If the last DatabaseCommand in a message is invalid, don't leave the source hanging in an unsynced state.
* DatabaseImpl can now resolve results by their URL.
* Updated README.
* Little fixes / cleanups all over the place.
2011-01-09 07:22:42 +01:00
Leo Franchi
9e3aab1e38
fix static mode dynamic playlists
2011-01-08 19:02:13 -05:00
Leo Franchi
8668b1013c
more working static playlists
2011-01-07 22:37:31 -05:00
Christian Muehlhaeuser
7a9a117307
* Fixed recursive message fetching bug.
2011-01-07 08:51:40 +01:00
Christian Muehlhaeuser
e462c3a3d9
* Report last op's guid in DatabaseCommand_LoadOps' done signal.
2011-01-06 12:35:49 +01:00
Christian Muehlhaeuser
395a1a58c2
* Keep an internal last op guid for DbSyncConnection.
2011-01-06 12:19:44 +01:00
Christian Muehlhaeuser
64ebd68c1d
* Some more DatabaseImpl cleanups.
2011-01-06 11:52:36 +01:00
Christian Muehlhaeuser
1eb4adaefe
* Seemed unsafe to reuse the same sql query object over and over again.
2011-01-06 11:45:09 +01:00
Christian Muehlhaeuser
0b26cf1695
* Don't reset lastop for singleton commands.
2011-01-06 10:38:44 +01:00
Christian Muehlhaeuser
a60ae88ff8
* DatabaseCommands can now be marked "singleton-commands", which means that only the latest enqueued command of this type will be kept in the oplog.
2011-01-06 10:13:47 +01:00
Christian Muehlhaeuser
8d50ef1b88
* Added activity label to sources in the sidebar (currently only shows Idle / currently playing track).
...
* DatabaseCommand_LogPlayback now contains an action-enum, which indicates if the track has just started / finished playback.
2011-01-06 09:03:18 +01:00
Christian Muehlhaeuser
ce30f01ec9
* Silly windows issue prevented SIP plugins from loading.
2011-01-04 11:26:41 +01:00
Christian Muehlhaeuser
2d71bb3c62
* More debug output when trying to load a library.
2011-01-04 11:39:43 +01:00
Christian Muehlhaeuser
65914c9d64
* Further win32 fixes.
2011-01-04 10:40:43 +01:00
Christian Muehlhaeuser
318ed169eb
* Fix recursive dllmacro.h inclusion.
2011-01-04 10:12:59 +01:00
Christian Muehlhaeuser
08f41b796c
* Further Win32 plugin fixes. Well, hopefully.
2011-01-04 09:55:04 +01:00
Christian Muehlhaeuser
087d910359
* Forgot to update DatabaseCommand.
2011-01-04 09:44:43 +01:00
Christian Muehlhaeuser
5863dc7e14
* Two new DatabaseCommands: LogPlayback and PlaybackHistory.
...
* LogPlayback keeps track of recently played songs in the database.
* PlaybackHistory retrieves playback logs from the database.
* Added "recently-played" views to WelcomeWidget & SourceInfoWidget.
* Needs testing.
2011-01-04 09:37:04 +01:00
Leo Franchi
2172f68a66
Fix merge and compile, fix schema issue
2011-01-03 23:50:09 -06:00
Leo Franchi
c28a7b8aa4
Merge branch 'master' into dynamic
...
Conflicts:
src/CMakeLists.txt
src/libtomahawk/collection.cpp
src/libtomahawk/collection.h
src/libtomahawk/network/filetransferconnection.h
src/libtomahawk/playlist.h
src/libtomahawk/query.h
src/libtomahawk/result.h
src/playlist/playlistmanager.cpp
src/playlist/plitem.h
src/tomahawkwindow.cpp
2011-01-03 22:31:37 -06:00
Christian Muehlhaeuser
f3b7375779
* Updated README.
2011-01-03 14:43:49 +01:00
Christian Muehlhaeuser
108f8cf93b
* Added basic WelcomeWidget, which gets shown when Tomahawk starts up. Again, work in progress.
2011-01-03 13:08:41 +01:00
Christian Muehlhaeuser
a5b495127a
* Interactive create-new-playlist dialog. Work in progress.
2011-01-03 05:18:25 +01:00
Christian Muehlhaeuser
0af3ac8c80
* Updated OSX build scripts.
2011-01-03 03:50:08 +01:00
Leo Franchi
a305c97972
link to libtomahawk on osx
2011-01-02 13:05:12 -06:00
Christian Muehlhaeuser
6f67d59bf2
* Fixed compiling on Win32.
2010-12-28 02:34:47 +01:00
Christian Muehlhaeuser
83f2ddeebd
* Fixed CMakeLists.txt for SIP plugins.
2010-12-28 02:20:03 +01:00
Christian Muehlhaeuser
7c935282ae
Merge branch 'master' of github.com:tomahawk-player/tomahawk
2011-01-01 00:21:04 +01:00
Christian Muehlhaeuser
82bd91af19
* Fix SIP plugins on Win32.
2011-01-01 00:20:28 +01:00
Jeff Mitchell
aaf7fc7c3f
Install to "." makes libraries install into very bad (and non-working) locations. Put them
...
in lib like they're supposed to be...(and like they are elsewhere in the
app)
2010-12-30 20:28:29 -05:00
Christian Muehlhaeuser
8b9b02e15d
* Mentioning Alejandro (xevix) in the About Dialog.
2010-12-28 06:23:15 +01:00
Christian Muehlhaeuser
27e906f712
* Split tomahawk into application and tomahawklib.
...
* Plugins link to and interface with tomahawklib.
* Compiles on Linux and Win32, but needs some more export macro love for the sip plugins on Win32.
2010-12-28 06:12:48 +01:00
Leo Franchi
8f1a768e86
WIP
2010-12-19 19:25:56 -05:00
Christian Muehlhaeuser
1496d322bf
* Fixed copy & paste mistake.
2010-12-15 15:14:58 +01:00
Christian Muehlhaeuser
857763e31d
* Moved zeroconf code into a separate sip plugin (we might want to re-think the SipPlugin interface).
2010-12-15 15:11:33 +01:00
Leo Franchi
004962866c
some more work. crashes serializing dbcommand
2010-12-14 23:00:04 -05:00
Alejandro Wainzinger
3b507ff7a8
Make the Connect/Disconnect button do as advertised. Needs some more safety checks likely, but this will do for now.
2010-12-13 18:49:02 -08:00
Alejandro Wainzinger
e882c4f0a9
Fix OS X linking problem and plugin loading on OS X and Windows.
2010-12-12 21:41:43 -08:00
Alejandro Wainzinger
d74dd577fd
Add OSX build instructions.
...
(cherry picked from commit f4a2cb2b8d
2010-12-12 19:17:54 -08:00
Alejandro Wainzinger
a87868c1f5
Change device name string handling to use safe conversion to CString (Was causing issues on OSX 10.6.5 Japanese)
...
(cherry picked from commit 17fb7abb8c
2010-12-12 19:17:31 -08:00
Leo Franchi
dedcd7a0f5
first working playlists, wohoo :D
2010-12-12 21:51:26 -05:00
Leo Franchi
e9963bb4d2
collapse plus and minus tosame button area
2010-12-12 17:09:51 -05:00
Leo Franchi
0df8ea0732
finally fix most of the layout issues.
...
god i hate qlayout...
2010-12-12 17:00:31 -05:00
Leo Franchi
c345ee6e35
fix database stuff
2010-12-12 14:08:25 -05:00
Leo Franchi
a1a01784ee
ugly gui for basic functionality
2010-12-11 18:23:11 -05:00
Leo Franchi
4460f3ce60
add a collapse button to the dynamic control widget too
2010-12-11 15:59:19 -05:00
Leo Franchi
eed7a33578
hook up the dynamic GUI a bit
2010-12-11 15:25:17 -05:00
