Index: Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/mixerlink.html
===================================================================
--- Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/mixerlink.html (revision 10277)
+++ Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/mixerlink.html (working copy)
@@ -1,4 +1,4 @@
-[%- IF item.musicmagic_mixable %]
+[%- IF item.musicmagic_mixable %]
[%- IF controlGraphics %]
+
[% src_mix %] [% "MUSICMAGIC_MIX" | string %]
Index: Plugins/MusicMagic/Plugin.pm
===================================================================
--- Plugins/MusicMagic/Plugin.pm (revision 10277)
+++ Plugins/MusicMagic/Plugin.pm (working copy)
@@ -862,6 +862,8 @@
# For the moment, skip straight to InstantMix mode. (See VarietyCombo)
$mix = getMix($client, $obj->name, 'artist');
+
+ $params->{'src_mix'} = Slim::Music::Info::standardTitle(undef, $obj->name);
}
} elsif ($album) {
@@ -876,6 +878,8 @@
if ($trackObj) {
$mix = getMix($client, $trackObj->path, 'album');
+
+ $params->{'src_mix'} = Slim::Music::Info::standardTitle(undef, $obj);
}
}
@@ -887,11 +891,14 @@
# For the moment, skip straight to InstantMix mode. (See VarietyCombo)
$mix = getMix($client, $obj->name, 'genre');
+
+ $params->{'src_mix'} = Slim::Music::Info::standardTitle(undef, $obj->name);
}
} elsif (defined $year) {
$mix = getMix($client, $year, 'year');
+ $params->{'src_mix'} = $year;
} else {
Index: Slim/Schema/Year.pm
===================================================================
--- Slim/Schema/Year.pm (revision 10277)
+++ Slim/Schema/Year.pm (working copy)
@@ -46,6 +46,15 @@
my ($self, $form, $descend, $sort) = @_;
$form->{'text'} = $self->name;
+
+ my $Imports = Slim::Music::Import->importers;
+
+ for my $mixer (keys %{$Imports}) {
+
+ if (defined $Imports->{$mixer}->{'mixerlink'}) {
+ &{$Imports->{$mixer}->{'mixerlink'}}($self, $form, $descend);
+ }
+ }
}
1;