[Slim-Checkins] r11786 - in /trunk/server/Slim: Music/Import.pm Plugin/MusicMagic/Common.pm Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html Plugin/MusicMagic/Importer.pm Plugin/MusicMagic/Plugin.pm Plugin/MusicMagic/Settings.pm
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Fri Apr 20 17:43:37 PDT 2007
Author: kdf
Date: Fri Apr 20 17:43:37 2007
New Revision: 11786
URL: http://svn.slimdevices.com?rev=11786&view=rev
Log:
Bug: n/a
Description: go back to using 'musicmagic' as the pref name for enabling musicIP. pass importer args to scanner
Modified:
trunk/server/Slim/Music/Import.pm
trunk/server/Slim/Plugin/MusicMagic/Common.pm
trunk/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html
trunk/server/Slim/Plugin/MusicMagic/Importer.pm
trunk/server/Slim/Plugin/MusicMagic/Plugin.pm
trunk/server/Slim/Plugin/MusicMagic/Settings.pm
Modified: trunk/server/Slim/Music/Import.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Import.pm?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Music/Import.pm (original)
+++ trunk/server/Slim/Music/Import.pm Fri Apr 20 17:43:37 2007
@@ -98,8 +98,10 @@
}
# Add in the various importer flags
+ # TODO: rework to only access prefs IF Importer is active
for my $importer (qw(itunes musicmagic)) {
-
+ my $prefs = preferences("plugin.$importer");
+
if ($prefs->get($importer)) {
$args->{$importer} = 1;
Modified: trunk/server/Slim/Plugin/MusicMagic/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MusicMagic/Common.pm?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MusicMagic/Common.pm (original)
+++ trunk/server/Slim/Plugin/MusicMagic/Common.pm Fri Apr 20 17:43:37 2007
@@ -73,8 +73,8 @@
sub checkDefaults {
- if (!defined $prefs->get('enabled')) {
- $prefs->set('enabled',0)
+ if (!defined $prefs->get('musicmagic')) {
+ $prefs->set('musicmagic',0)
}
if (!defined $prefs->get('mix_type')) {
Modified: trunk/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html (original)
+++ trunk/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html Fri Apr 20 17:43:37 2007
@@ -1,12 +1,12 @@
[% PROCESS settings/header.html %]
- [% IF prefs.exists('enabled') %]
+ [% IF prefs.exists('musicmagic') %]
<div class="settingSection">
<div class="prefHead">[% "MUSICMAGIC" | string | upper %]</div>
<div class="prefDesc">[% "SETUP_MUSICMAGIC_DESC" | string %]</div>
- <label for="enabled" class="stdlabel">[% "USE_MUSICMAGIC" | string %]</label>
- <input type="checkbox" [% IF prefs.enabled %]checked [% END %] class="stdedit" name="enabled" id="enabled" />
+ <label for="musicmagic" class="stdlabel">[% "USE_MUSICMAGIC" | string %]</label>
+ <input type="checkbox" [% IF prefs.musicmagic %]checked [% END %] class="stdedit" name="musicmagic" id="musicmagic" />
</div>
[% END %]
Modified: trunk/server/Slim/Plugin/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MusicMagic/Importer.pm?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MusicMagic/Importer.pm (original)
+++ trunk/server/Slim/Plugin/MusicMagic/Importer.pm Fri Apr 20 17:43:37 2007
@@ -43,24 +43,24 @@
if (defined($newValue)) {
if (!$can) {
- $prefs->set('enabled', 0);
+ $prefs->set('musicmagic', 0);
} else {
- $prefs->set('enabled', $newValue);
- }
- }
-
- my $use = $prefs->get('enabled');
+ $prefs->set('musicmagic', $newValue);
+ }
+ }
+
+ my $use = $prefs->get('musicmagic');
if (!defined($use) && $can) {
- $prefs->set('enabled', 1);
+ $prefs->set('musicmagic', 1);
} elsif (!defined($use) && !$can) {
- $prefs->set('enabled', 0);
- }
-
- $use = $prefs->get('enabled') && $can;
+ $prefs->set('musicmagic', 0);
+ }
+
+ $use = $prefs->get('musicmagic') && $can;
Slim::Music::Import->useImporter($class, $use);
@@ -110,7 +110,7 @@
Slim::Music::Import->addImporter($class, {
'reset' => \&resetState,
'playlistOnly' => 1,
- 'use' => $prefs->get('enabled'),
+ 'use' => $prefs->get('musicmagic'),
});
Slim::Player::ProtocolHandlers->registerHandler('musicmagicplaylist', 0);
Modified: trunk/server/Slim/Plugin/MusicMagic/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MusicMagic/Plugin.pm?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MusicMagic/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/MusicMagic/Plugin.pm Fri Apr 20 17:43:37 2007
@@ -60,21 +60,21 @@
if (defined($newValue)) {
if (!$can) {
- $prefs->set('enabled', 0);
+ $prefs->set('musicmagic', 0);
} else {
- $prefs->set('enabled', $newValue);
- }
- }
-
- my $use = $prefs->get('enabled');
+ $prefs->set('musicmagic', $newValue);
+ }
+ }
+
+ my $use = $prefs->get('musicmagic');
if (!defined($use) && $can) {
- $prefs->set('enabled', 1);
+ $prefs->set('musicmagic', 1);
} elsif (!defined($use) && !$can) {
- $prefs->set('enabled', 0);
- }
-
- $use = $prefs->get('enabled') && $can;
+ $prefs->set('musicmagic', 0);
+ }
+
+ $use = $prefs->get('musicmagic') && $can;
$log->info("Using musicip: $use");
@@ -306,7 +306,7 @@
sub checker {
my $firstTime = shift || 0;
- if (!$prefs->get('enabled')) {
+ if (!$prefs->get('musicmagic')) {
return;
}
@@ -541,7 +541,7 @@
}
# only add link if enabled and usable
- if (canUseMusicMagic() && $prefs->get('enabled')) {
+ if (canUseMusicMagic() && $prefs->get('musicmagic')) {
# set up a musicmagic link
$form->{'mixerlinks'}{Slim::Plugin::MusicMagic::Plugin->title()} = "plugins/MusicMagic/mixerlink.html";
Modified: trunk/server/Slim/Plugin/MusicMagic/Settings.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MusicMagic/Settings.pm?rev=11786&r1=11785&r2=11786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MusicMagic/Settings.pm (original)
+++ trunk/server/Slim/Plugin/MusicMagic/Settings.pm Fri Apr 20 17:43:37 2007
@@ -21,7 +21,7 @@
my $prefs = preferences('plugin.musicmagic');
$prefs->migrate(1, sub {
- $prefs->set('enabled', Slim::Utils::Prefs::OldPrefs->get('musicmagic'));
+ $prefs->set('musicmagic', Slim::Utils::Prefs::OldPrefs->get('musicmagic'));
$prefs->set('scan_interval', Slim::Utils::Prefs::OldPrefs->get('musicmagicscaninterval') || 3600 );
$prefs->set('player_settings', Slim::Utils::Prefs::OldPrefs->get('MMMPlayerSettings') || 0 );
$prefs->set('port', Slim::Utils::Prefs::OldPrefs->get('MMSport') || 10002 );
@@ -36,7 +36,7 @@
$prefs->set('playlist_prefix', Slim::Utils::Prefs::OldPrefs->get('MusicMagicplaylistprefix') || 'MusicIP: ' );
$prefs->set('playlist_suffix', Slim::Utils::Prefs::OldPrefs->get('MusicMagicplaylistsuffix') || '' );
- $prefs->set('enabled', 0) unless defined $prefs->get('enabled'); # default to on if not previously set
+ $prefs->set('musicmagic', 0) unless defined $prefs->get('musicmagic'); # default to on if not previously set
# use new naming of the old default wasn't changed
if ($prefs->get('playlist_prefix') eq 'MusicMagic: ') {
@@ -49,13 +49,13 @@
$prefs->setChange(
sub {
- Slim::Music::Import->useImporter('Plugin::iTunes::Plugin', $_[1]);
+ Slim::Music::Import->useImporter('Plugin::MusicMagic::Plugin', $_[1]);
for my $c (Slim::Player::Client::clients()) {
Slim::Buttons::Home::updateMenu($c);
}
},
- 'enabled',
+ 'musicmagic',
);
sub name {
@@ -67,7 +67,7 @@
}
sub prefs {
- return ($prefs, qw(enabled scan_interval player_settings port mix_filter reject_size reject_type
+ return ($prefs, qw(musicmagic scan_interval player_settings port mix_filter reject_size reject_type
mix_genre mix_variety mix_style mix_type mix_size playlist_prefix playlist_suffix));
}
@@ -75,7 +75,7 @@
my ($class, $client, $params) = @_;
# Cleanup the checkbox
- $params->{'enabled'} = defined $params->{'enabled'} ? 1 : 0;
+ $params->{'musicmagic'} = defined $params->{'musicmagic'} ? 1 : 0;
$params->{'filters'} = grabFilters();
More information about the checkins
mailing list