diff options
| author |  waker <wakeroid@gmail.com> | 2011-10-23 11:50:41 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-10-23 11:50:41 +0200 |
| commit | a9c813ddbda28a2d0beff104fe8cf80299292533 (patch) | |
| tree | 5630dfd20c5e4484148dc4fde06fdb2a0e9aeefa /plugins/artwork | |
| parent | 2f2937a5554d4cdca177eb546a0e0c449b16c700 (diff) | |
| parent | 50208fdf54d7afaf8b42abc511ddc675b9475184 (diff) | |
Merge branch 'master' into devel
Conflicts:
deadbeef.h
metacache.c
playlist.c
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddbcellrenderertextmultiline.h
plugins/gtkui/ddbequalizer.c
plugins/gtkui/ddbequalizer.h
plugins/gtkui/ddbseekbar.c
plugins/gtkui/ddbseekbar.h
plugins/gtkui/ddbtabstrip.c
plugins/gtkui/fileman.c
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/gtkui/trkproperties.c
Diffstat (limited to 'plugins/artwork')
| -rw-r--r-- | plugins/artwork/artwork.c | 2 | ||||
| -rw-r--r-- | plugins/artwork/lastfm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index e395756d..458737fb 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -31,7 +31,7 @@ static uintptr_t imlib_mutex; #define trace(...) static char default_cover[PATH_MAX]; -#define DEFAULT_FILEMASK "*cover*.jpg;*front*.jpg;*folder*.jpg" +#define DEFAULT_FILEMASK "*cover*.jpg;*front*.jpg;*folder*.jpg;*cover*.png;*front*.png;*folder*.png" static DB_artwork_plugin_t plugin; DB_functions_t *deadbeef; diff --git a/plugins/artwork/lastfm.c b/plugins/artwork/lastfm.c index 91972c8a..5b5cedd4 100644 --- a/plugins/artwork/lastfm.c +++ b/plugins/artwork/lastfm.c @@ -11,7 +11,7 @@ #include "escape.h" #define BASE_URL "http://ws.audioscrobbler.com/2.0/" -#define API_KEY "b25b959554ed76058ac220b7b2e0a026" +#define API_KEY "6b33c8ae4d598a9aff8fe63e334e6e86" //#define trace(...) { fprintf(stderr, __VA_ARGS__); } #define trace(...) |