diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
| commit | 9460844e2a1598dfe24a72dd2a283d02b57caddc (patch) | |
| tree | 0ec32a2b5453d3e5d299aa325b3c5a3be964092a /plugins/lastfm | |
| parent | e09556d82ca4b470dc8f5904a1080dffe2ffeb7b (diff) | |
| parent | feecc0214decb6d1b9911aafe140034449266430 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/vorbis/vorbis.c
streamer.c
Diffstat (limited to 'plugins/lastfm')
| -rw-r--r-- | plugins/lastfm/lastfm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/lastfm/lastfm.c b/plugins/lastfm/lastfm.c index de86357e..28969561 100644 --- a/plugins/lastfm/lastfm.c +++ b/plugins/lastfm/lastfm.c @@ -665,7 +665,7 @@ lfm_thread (void *ctx) { trace ("lfm sending nowplaying...\n"); // try to send nowplaying - if (lfm_nowplaying[0]) { + if (lfm_nowplaying[0] && !deadbeef->conf_get_int ("lastfm.disable_np", 0)) { lfm_send_nowplaying (); } lfm_send_submissions (); @@ -801,6 +801,7 @@ static const char settings_dlg[] = "property Username entry lastfm.login \"\";\n" "property Password password lastfm.password \"\";" "property \"Scrobble URL\" entry lastfm.scrobbler_url \""SCROBBLER_URL_LFM"\";" + "property \"Disable nowplaying\" checkbox lastfm.disable_np 0;" ; // define plugin interface |