Index: /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html	(revision 23141)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/settings/musicmagic.html	(working copy)
@@ -1,9 +1,14 @@
 [% PROCESS settings/header.html %]
 
 	[% IF prefs.exists('pref_musicip') %]
-		[% WRAPPER setting title="MUSICMAGIC" desc="SETUP_MUSICMAGIC_DESC" %]
-			<input type="checkbox" [% IF prefs.pref_musicip %]checked [% END %] class="stdedit" name="pref_musicip" id="musicmagic" />	
-			<label for="musicmagic" class="stdlabel">[% "USE_MUSICMAGIC" | string %]</label>
+		[% WRAPPER setting title="USE_MUSICMAGIC" desc="SETUP_MUSICMAGIC_DESC" %]
+			<select class="stdedit" name="pref_musicip" id="pref_musicip">
+	
+				<option [% IF NOT prefs.pref_musicip %]selected [% END %]value="0">[% 'DONT_USE_MUSICMAGIC' | getstring %]</option>
+				<option [% IF prefs.pref_musicip == 1 %]selected [% END %]value="1">[% 'MUSICIP_READSONGDATA' | getstring %]</option>
+				<option [% IF prefs.pref_musicip == 2 %]selected [% END %]value="2">[% 'MUSICIP_MIXABLE_CHECK' | getstring %]</option>
+			
+			</select>
 		[% END %]
 	[% END %]
 
Index: /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Importer.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Importer.pm	(revision 23142)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Importer.pm	(working copy)
@@ -39,6 +39,8 @@
 
 my $prefs = preferences('plugin.musicip');
 
+my @MIPSupportedFormats = ('m4a', 'm4p', 'mp3', 'wma', 'ogg', 'flc', 'wav');
+
 sub useMusicMagic {
 	my $class    = shift;
 	my $newValue = shift;
@@ -172,82 +174,204 @@
 	$MMSport = $prefs->get('port') unless $MMSport;
 	$MMSHost = $prefs->get('host') unless $MMSHost;
 
-	my $count = get("http://$MMSHost:$MMSport/api/getSongCount");
+	$class->exportSongs;
+	$class->exportPlaylists;
+	$class->exportDuplicates;
+}
+
+sub exportSongs {
+	my $class = shift;
 
-	if ($count) {
+	my $fullRescan = $::wipe ? 1 : 0;
 
-		# convert to integer
-		chomp($count);
+	if ($fullRescan == 1 || $prefs->get('musicip') == 1) {
+		$log->info("MusicIP mixable status full scan");
 
-		$count += 0;
-	}
+		my $count = get("http://$MMSHost:$MMSport/api/getSongCount");
+		if ($count) {
+			# convert to integer
+			chomp($count);
+			$count += 0;
+		}
 
-	$log->info("Got $count song(s).");
+		$log->info("Got $count song(s).");
 
-	$class->exportSongs($count);
-	$class->exportPlaylists;
-	$class->exportDuplicates;
-}
+		my $progress = Slim::Utils::Progress->new({ 
+			'type'  => 'importer', 
+			'name'  => 'musicip', 
+			'total' => $count, 
+			'bar'   => 1
+		});
 
-sub exportSongs {
-	my $class = shift;
-	my $count = shift;
+		# MMM Version 1.5+ adds support for /api/songs?extended, which pulls
+		# down the entire library, separated by $LF$LF - this allows us to make
+		# 1 HTTP request, and the process the file.
+		if (Slim::Utils::Versions->compareVersions($MMMVersion, '1.5') >= 0) {
+			$log->info("Fetching ALL song data via songs/extended..");
+
+			my $MMMSongData = catdir( preferences('server')->get('cachedir'), 'mmm-song-data.txt' );
+			my $MMMDataURL  = "http://$MMSHost:$MMSport/api/songs?extended";
 
-	my $progress = Slim::Utils::Progress->new({ 
-		'type'  => 'importer', 
-		'name'  => 'musicip', 
-		'total' => $count, 
-		'bar'   => 1
-	});
+			getstore($MMMDataURL, $MMMSongData);
 
-	# MMM Version 1.5+ adds support for /api/songs?extended, which pulls
-	# down the entire library, separated by $LF$LF - this allows us to make
-	# 1 HTTP request, and the process the file.
-	if (Slim::Utils::Versions->compareVersions($MMMVersion, '1.5') >= 0) {
+			if (!-r $MMMSongData) {
+				logError("Couldn't connect to $MMMDataURL ! : $!");
+				return;
+			}
 
-		$log->info("Fetching ALL song data via songs/extended..");
+			open(MMMDATA, $MMMSongData) || do {
+				logError("Couldn't read file: $MMMSongData : $!");
+				return;
+			};
 
-		my $MMMSongData = catdir( preferences('server')->get('cachedir'), 'mmm-song-data.txt' );
+			$log->info("Finished fetching - processing.");
 
-		my $MMMDataURL  = "http://$MMSHost:$MMSport/api/songs?extended";
+			local $/ = "$LF$LF";
 
-		getstore($MMMDataURL, $MMMSongData);
+			if ($prefs->get('musicip') != 1) {
+				
+				while(my $content = <MMMDATA>) {
+					$class->setMixable($content, $progress);
+				}
+				
+			} else {
+				
+				while(my $content = <MMMDATA>) {
+					$class->processSong($content, $progress);
+				}
+				
+			}
 
-		if (!-r $MMMSongData) {
+			close(MMMDATA);
+			unlink($MMMSongData);
+		} else {
+			for (my $scan = 0; $scan <= $count; $scan++) {
+				my $content = get("http://$MMSHost:$MMSport/api/getSong?index=$scan");
 
-			logError("Couldn't connect to $MMMDataURL ! : $!");
-			return;
+				$class->processSong($content, $progress);
+			}
 		}
 
-		open(MMMDATA, $MMMSongData) || do {
+		$progress->final($count) if $progress;
+	}
+	else {
+		$log->info("MusicIP mixable status scan for all songs not currently mixable");
 
-			logError("Couldn't read file: $MMMSongData : $!");
-			return;
-		};
+		my @notMixableTracks = Slim::Schema->rs('Track')->search({
+			'audio' => '1', 
+			'remote' => '0', 
+			'musicmagic_mixable' => undef, 
+			'content_type' => { in => \@MIPSupportedFormats}
+		});
+
+		my $count = @notMixableTracks;
+		$log->info("Got $count song(s).");
+
+		my $progress = Slim::Utils::Progress->new({ 
+			'type'  => 'importer', 
+			'name'  => 'musicip', 
+			'total' => $count, 
+			'bar'   => 1
+		});
+
+		for my $track (@notMixableTracks) {
+			my $trackurl = $track->url;
+
+			$log->debug("trackurl: $trackurl");
+
+			# Convert $track->url to a path and call MusicIP
+			my $path = Slim::Utils::Misc::pathFromFileURL($trackurl);
+
+			my $pathEnc = Slim::Utils::Misc::escape($path);
+
+			# Set musicmagic_mixable on $track object and call $track->update to actually store it.
+			my $result = get("http://$MMSHost:$MMSport/api/status?song=$pathEnc");
 
-		$log->info("Finished fetching - processing.");
+			if ($result =~ /^(\w+)\s+(.*)/) {
 
-		local $/ = "$LF$LF";
+				my $mixable = $1;
+				if ($mixable eq 1) {
+					$log->debug("track: $path is mixable");
+					$class->setSongMixable($track);
+				}
+				else {
+					$log->warn("track: $path is not mixable");
+				}
 
-		while(my $content = <MMMDATA>) {
+			}
 
-			$class->processSong($content, $progress);
+			$progress->update($path);
 		}
 
-		close(MMMDATA);
-		unlink($MMMSongData);
+		$progress->final($count) if $progress;
+	}
+}
+
+sub setMixable
+{
+	my $class    = shift;
+	my $content  = shift || return;
+	my $progress = shift;
+
+	my $file;
+	my $active;
 
-	} else {
+	my @lines = split(/\n/, $content);
+	
+	for my $line (@lines) {
 
-		for (my $scan = 0; $scan <= $count; $scan++) {
+		if ($line =~ /^(\w+)\s+(.*)/) {
 
-			my $content = get("http://$MMSHost:$MMSport/api/getSong?index=$scan");
+			if ($1 eq 'file') {
+				# need conversion to the current charset.
+				$file = Slim::Utils::Unicode::utf8encode_locale($2);
+			}
+			elsif ($1 eq 'active') {
+				$active = $2
+			}
 
-			$class->processSong($content, $progress);
 		}
 	}
 
-	$progress->final($count) if $progress;
+	if ($active eq 'yes') {
+		my $fileurl = Slim::Utils::Misc::fileURLFromPath($file);
+	
+		my $track = Slim::Schema->rs('Track')->objectForUrl($fileurl)
+		|| do {
+			$log->warn("Couldn't get track for $fileurl");
+			$progress->update($file);
+			return;
+		};
+
+		$log->debug("track: $file is mixable");
+		$class->setSongMixable($track);
+	}
+
+	$progress->update($file);
+}
+
+sub setSongMixable {
+	my $class = shift;
+	my $track = shift;
+
+	$track->musicmagic_mixable(1);
+	$track->update;
+
+	my $albumObj = $track->album;
+	if (blessed($albumObj)) {
+		$albumObj->musicmagic_mixable(1);
+		$albumObj->update;
+	}
+
+	for my $artistObj ($track->contributors) {
+		$artistObj->musicmagic_mixable(1);
+		$artistObj->update;
+	}
+
+	for my $genreObj ($track->genres) {
+		$genreObj->musicmagic_mixable(1);
+		$genreObj->update;
+	}
 }
 
 sub processSong {
@@ -299,11 +423,11 @@
 	}
 
 	# Assign these after they may have been verified as UTF-8
-	$attributes{'ALBUM'}  = $songInfo{'album'}  if $songInfo{'album'};
-	$attributes{'TITLE'}  = $songInfo{'name'}   if $songInfo{'name'};
-	$attributes{'ARTIST'} = $songInfo{'artist'} if $songInfo{'artist'};
-	$attributes{'GENRE'}  = $songInfo{'genre'}  if $songInfo{'genre'};
-	$attributes{'MUSICMAGIC_MIXABLE'} = 1       if $songInfo{'active'} eq 'yes';
+ 	$attributes{'ALBUM'}  = $songInfo{'album'}  if $songInfo{'album'} && $songInfo{'album'} ne 'Miscellaneous';
+ 	$attributes{'TITLE'}  = $songInfo{'name'}   if $songInfo{'name'};
+ 	$attributes{'ARTIST'} = $songInfo{'artist'} if $songInfo{'artist'} && $songInfo{'artist'} ne 'Various Artists';
+ 	$attributes{'GENRE'}  = $songInfo{'genre'}  if $songInfo{'genre'} && $songInfo{'genre'} ne 'Miscellaneous';
+ 	$attributes{'MUSICMAGIC_MIXABLE'} = 1       if $songInfo{'active'} eq 'yes';
 
 	# need conversion to the current charset.
 	$songInfo{'file'} = Slim::Utils::Unicode::utf8encode_locale($songInfo{'file'});
Index: /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Settings.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Settings.pm	(revision 23142)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/Settings.pm	(working copy)
@@ -126,9 +126,6 @@
 sub handler {
 	my ($class, $client, $params, $callback, @args) = @_;
 
-	# Cleanup the checkbox
-	$params->{'pref_musicip'} = defined $params->{'pref_musicip'} ? 1 : 0;
-
 	if ( !$params->{'saveSettings'} ) {
 
 		$class->grabFilters($client, $params, $callback, @args);
Index: /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/strings.txt
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/strings.txt	(revision 23141)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Plugin/MusicMagic/strings.txt	(working copy)
@@ -55,18 +55,18 @@
 	ZH_CN	这个选项决定了导入MusicIP播放表所使用的格式。
 
 SETUP_MIX_TYPE
-	DA	MusicIP Mix-type
-	DE	MusicIP-Mix: Typ
-	EN	MusicIP Mix Type
-	ES	Tipo de mezcla de MusicIP
-	FI	MusicIP-miksin tyyppi
-	FR	Type de mix MusicIP
-	HE	סוג מיקס של MusicIP
-	IT	Tipo di raccolta MusicIP
-	NL	MusicIP-mixtype
-	NO	MusicIP-mikstype
-	SV	MusicIP Mix: Typ
-	ZH_CN	MusicIP混音类型
+	DA	Mix-type
+	DE	Mix: Typ
+	EN	Mix Type
+	ES	Tipo de mezcla
+	FI	Miksin tyyppi
+	FR	Type de mix
+	HE	סוג מיקס של 
+	IT	Tipo di raccolta
+	NL	Mixtype
+	NO	Mikstype
+	SV	Mix: Typ
+	ZH_CN	混音类型
 
 SETUP_MIX_TYPE_DESC
 	DA	Størrelsen af et MusicIP Mix kan defineres på tre måder: Antal numre, minutter eller megabyte (standard er numre)
@@ -83,18 +83,18 @@
 	ZH_CN	您的MusicIP混音量可从三种数量设置做选择：轨道、分钟、兆字节（缺省轨道）
 
 SETUP_MIX_SIZE
-	DA	MusicIP Mix: størrelse
-	DE	MusicIP-Mix: Größe
-	EN	MusicIP Mix Size
-	ES	Tamaño de mezcla de MusicIP
-	FI	MusicIP-miksin koko
-	FR	Taille du mix MusicIP
-	HE	גודל מיקס של MusicIP
-	IT	Dimensioni della raccolta MusicIP
-	NL	MusicIP-mixgrootte
-	NO	MusicIP miksstørrelse
-	SV	MusicIP Mix: Storlek
-	ZH_CN	MusicIP混音量
+	DA	Mix: størrelse
+	DE	Mix: Größe
+	EN	Mix Size
+	ES	Tamaño de mezcla
+	FI	Miksin koko
+	FR	Taille du mix
+	HE	גודל מיקס של
+	IT	Dimensioni della raccolta
+	NL	Mixgrootte
+	NO	Miksstørrelse
+	SV	Mix: Storlek
+	ZH_CN	混音量
 
 SETUP_MIX_SIZE_DESC
 	CS	Vyberte Mix Size
@@ -112,18 +112,18 @@
 	ZH_CN	请选择MusicIP混音量
 
 SETUP_MIX_FILTER
-	DA	MusicIP Mix-filter
-	DE	MusicIP-Mixfilter
-	EN	MusicIP Mix Filter
-	ES	Filtro de mezcla de MusicIP
-	FI	MusicIP-miksin suodatin
-	FR	Filtre de mix MusicIP
-	HE	מסנן מיקסים של MusicIP
-	IT	Filtro per raccolte MusicIP
-	NL	MusicIP-mixfilter
-	NO	MusicIP miksefilter
-	SV	MusicIP Mix: Filter
-	ZH_CN	MusicIP混音过滤器
+	DA	Mix-filter
+	DE	Mixfilter
+	EN	Mix Filter
+	ES	Filtro de mezcla 
+	FI	Miksin suodatin
+	FR	Filtre de mix 
+	HE	מסנן מיקסים של 
+	IT	Filtro per raccolte 
+	NL	Mixfilter
+	NO	Miksefilter
+	SV	Mix: Filter
+	ZH_CN	混音过滤器
 
 SETUP_MIX_FILTER_DESC
 	DA	Du kan definere navngivne filterbetingelser i MusicIP og vælge at anvende disse filtre på miks fra MusicIP i SqueezeCenter.
@@ -140,18 +140,18 @@
 	ZH_CN	您可以利用MusicIP设立过滤器，并且从这表中选择应用在SqueezeCenter内MusicIP混音的那些过滤器。
 
 SETUP_MIX_GENRE
-	DA	MusicIP Mix: Genre
-	DE	MusicIP-Mix: Musikstil
-	EN	MusicIP Mix Genre
-	ES	Género de mezcla de MusicIP
-	FI	MusicIP-miksin genre
-	FR	Genre de mix MusicIP
-	HE	סגנון מיקס של MusicIP
-	IT	Genere della raccolta MusicIP
-	NL	MusicIP-mixgenre
-	NO	MusicIP sjangermiks
-	SV	MusicIP Mix: Genre
-	ZH_CN	MusicIP混音曲风
+	DA	Mix: Genre
+	DE	Mix: Musikstil
+	EN	Mix Genre
+	ES	Género de mezcla
+	FI	miksin genre
+	FR	Genre de mix
+	HE	סגנון מיקס של 
+	IT	Genere della raccolta
+	NL	Mixgenre
+	NO	Sjangermiks
+	SV	Mix: Genre
+	ZH_CN	混音曲风
 
 SETUP_MIX_GENRE_DESC
 	DA	Begræns miks til samme genre som det første valg (Standardværdi: Nej)
@@ -196,18 +196,18 @@
 	ZH_CN	配置拒绝量单位（确省：音轨）
 
 SETUP_REJECT_SIZE
-	DA	MusicIP afvisningsstørrelse
-	DE	MusicIP - Ablehnungsgröße
-	EN	MusicIP Reject Size
-	ES	Tamaño de rechazo de MusicIP
-	FI	MusicIP:n hylkäyskoko
-	FR	Taille de rejet MusicIP
-	HE	גודל הפסילות ב-MusicIP.
-	IT	N. elementi da scartare in MusicIP
-	NL	MusicIP-afkeurgrootte
-	NO	MusicIP avvisningsstørrelse
-	SV	Avvisningstyp för MusicIP
-	ZH_CN	MusicIP拒绝量
+	DA	Afvisningsstørrelse
+	DE	Ablehnungsgröße
+	EN	Reject Size
+	ES	Tamaño de rechazo 
+	FI	N hylkäyskoko
+	FR	Taille de rejet 
+	HE	גודל הפסילות ב-.
+	IT	N. elementi da scartare 
+	NL	Afkeurgrootte
+	NO	Avvisningsstørrelse
+	SV	Avvisningstyp 
+	ZH_CN	拒绝量
 
 SETUP_REJECT_SIZE_DESC
 	DA	Indstil antal elementer som skal springes over før en type gentages. (Standard: 12)
@@ -224,18 +224,18 @@
 	ZH_CN	配置重播一类别前跳过的数量（确省:12)
 
 SETUP_MMSHOST
-	DA	MusicIP HTTP-vært
-	DE	MusicIP - HTTP-Host
-	EN	MusicIP HTTP Host
-	ES	Host HTTP de MusicIP
-	FI	MusicIP:n HTTP-isäntä
-	FR	Hôte HTTP MusicIP
-	HE	מארח HTTP של MusicIP
-	IT	Host HTTP MusicIP
-	NL	MusicIP-HTTP-host
-	NO	MusicIP http-vert
-	SV	HTTP-värd för MusicIP
-	ZH_CN	MusicIP HTTP主机
+	DA	HTTP-vært
+	DE	HTTP-Host
+	EN	HTTP Host
+	ES	Host HTTP de 
+	FI	HTTP-isäntä
+	FR	Hôte HTTP 
+	HE	מארח HTTP של 
+	IT	Host HTTP 
+	NL	HTTP-host
+	NO	http-vert
+	SV	HTTP-värd för 
+	ZH_CN	HTTP主机
 
 SETUP_MMSHOST_DESC
 	DA	Vælg værtsnavnet eller IP-adressen for den eksterne eller lokale MusicIP-server
@@ -252,18 +252,18 @@
 	ZH_CN	请选择主机名或远程或本地的MusicIP服务器的IP地址
 
 SETUP_MIX_STYLE
-	DA	MusicIP Mix: Stil
-	DE	MusicIP-Mix - Stil
-	EN	MusicIP Mix Style
-	ES	Estilo de mezcla de MusicIP
-	FI	MusicIP-miksin tyyli
-	FR	Style du mix MusicIP
-	HE	סגנון מיקס של MusicIP
-	IT	Stile della raccolta MusicIP
-	NL	MusicIP-mixstijl
-	NO	MusicIP-stilmiks
-	SV	MusicIP Mix: Stil
-	ZH_CN	MusicIP混音风格
+	DA	Mix: Stil
+	DE	Mix - Stil
+	EN	Mix Style
+	ES	Estilo de mezcla 
+	FI	Miksin tyyli
+	FR	Style du mix 
+	HE	סגנון מיקס של 
+	IT	Stile della raccolta 
+	NL	Mixstijl
+	NO	Stilmiks
+	SV	Mix: Stil
+	ZH_CN	混音风格
 
 SETUP_MIX_STYLE_DESC
 	DA	Hvor meget som kunstnerens stil (0 = ignorer (standard), 200 = streng)
@@ -280,18 +280,18 @@
 	ZH_CN	有多接近艺人的风格 （0=不理睬（缺省），200=严格）
 
 SETUP_MIX_VARIETY
-	DA	MusicIP Mix: Variation
-	DE	MusicIP-Mix: Vielseitigkeit
-	EN	MusicIP Mix Variety
-	ES	Variedad de mezcla de MusicIP
-	FI	MusicIP-miksivalikoima
-	FR	Variété du mix MusicIP
-	HE	מגוון במיקס של MusicIP
-	IT	Varietà della raccolta MusicIP
-	NL	Variatie van MusicIP-mixen
-	NO	MusicIP blandingsmiks
-	SV	MusicIP Mix: Urval
-	ZH_CN	MusicIP混音品种变化
+	DA	Mix: Variation
+	DE	Mix: Vielseitigkeit
+	EN	Mix Variety
+	ES	Variedad de mezcla 
+	FI	miksivalikoima
+	FR	Variété du mix 
+	HE	מגוון במיקס של 
+	IT	Varietà della raccolta 
+	NL	Variatie van mixen
+	NO	Blandingsmiks
+	SV	Mix: Urval
+	ZH_CN	混音品种变化
 
 SETUP_MIX_VARIETY_DESC
 	DA	Hvor meget variation i mix (0 = lille (standard), 9 mere)
@@ -322,18 +322,18 @@
 	ZH_CN	MusicIP混音
 
 SETUP_MMMPLAYERSETTINGS
-	DA	MusicIP: afspillerindstillinger for hvert miks
-	DE	MusicIP-Mix - Player-Einstellungen
-	EN	MusicIP Player Settings for Each Mix
-	ES	Configuración de reproductor MusicIP para cada mezcla
-	FI	MusicIP-soittimen asetukset kutakin miksiä varten
-	FR	Réglages de la platine MusicIP pour chaque mix
-	HE	הגדרות נגן MusicIP עבור כל מיקס
-	IT	Impostazioni del lettore MusicIP per ciascuna raccolta
-	NL	Instellingen van MusicIP-muzieksysteem voor elke mix
-	NO	MusicIP spillerinnstillinger for hver miks
-	SV	MusicIP-spelarinställningar för varje mix
-	ZH_CN	MusicIP播放机上各个混音的设置
+	DA	Afspillerindstillinger for hvert miks
+	DE	Mix - Player-Einstellungen
+	EN	Player settings for each mix
+	ES	Configuración de reproductor para cada mezcla
+	FI	Soittimen asetukset kutakin miksiä varten
+	FR	Réglages de la platine pour chaque mix
+	HE	הגדרות נגן  עבור כל מיקס
+	IT	Impostazioni del lettore per ciascuna raccolta
+	NL	Instellingen van -muzieksysteem voor elke mix
+	NO	Spillerinnstillinger for hver miks
+	SV	Spelarinställningar för varje mix
+	ZH_CN	播放机上各个混音的设置
 
 SETUP_MMMPLAYERSETTINGS_DESC
 	DA	Du kan vælge at give hver enkelt afspiller adgang til indstillingerne for MusicIP Mix før du opretter et miks. Alle indstillinger som vælges på afspilleren, har forrang frem for serverindstillingerne indtil de ændres igen på afspilleren. Hvis du vil gå videre og begynde at oprette et miks vha. de eksisterende indstillinger på afspilleren og serveren, skal du vælge Nej.
@@ -452,18 +452,7 @@
 	ZH_CN	MusicIP
 
 SETUP_MUSICMAGIC_DESC
-	DA	SqueezeCenter kan bruge MusicIP som kilde til at hente oplysninger om titel og genre. Du kan også fremstille lynmiks baseret på en genre, en kunstner eller et nummer. Du skal markere feltet nedenfor hvis du vil importere oplysninger om MusicIP-biblioteket.
-	DE	SqueezeCenter kann MusicIP als Quelle für Titel- und Stilrichtungsangaben verwenden. Außerdem können Sie Instant Mixes auf Stilrichtungs-, Interpreten und Titelebene erstellen. Aktivieren Sie das Kontrollkästchen unten, um die MusicIP-Datenbank zu importieren.
-	EN	SqueezeCenter can use your MusicIP program as source for title and genre information. Additionally you can generate instant mixes on genre, artist and song level. Check the box below to import your MusicIP Library information.
-	ES	SqueezeCenter puede usar el programa MusicIP como origen para la información de título y de género. Además, se pueden generar mezclas instantáneas por género, artista y canción. Seleccione la casilla siguiente para importar la información de la biblioteca de MusicIP.
-	FI	SqueezeCenter voi käyttää MusicIP-ohjelmaa nimi- ja genretietojen lähteenä. Voit myös luoda välittömiä miksejä genre-, artisti- ja kappaletasolla. Tuo MusicIP-kirjaston tiedot lisäämällä valintamerkki alla olevaan ruutuun.
-	FR	Le SqueezeCenter peut utiliser le logiciel MusicIP comme source pour les titres et les genres. Vous pouvez également générer des mix instantanés par genre, par artiste ou par morceau. Cochez la case pour importer les données de votre bibliothèque MusicIP.
-	HE	SqueezeCenter יכול להשתמש בתוכנית MusicIP כמקור עבור מידע שמות וסגנונות. בנוסף, באפשרותך להפיק מיקסים מיידיים ברמת הסגנון, המבצע והשיר. סמן את התיבה שלהלן כדי לייבא את המידע של ספריית MusicIP.
-	IT	In SqueezeCenter il programma MusicIP può essere utilizzato come origine delle informazioni relative al titolo e al genere musicale. È inoltre possibile generare raccolte rapide in base al genere, all'artista e ai brani. Selezionare la casella seguente per importare i dati della libreria MusicIP.
-	NL	SqueezeCenter kan je MusicIP-programma gebruiken als bron voor titel- en genre-informatie. Ook kun je instantmixen maken op genre, artiest en liedje. Selecteer het vakje hieronder om je MusicIP-collectiegegevens te importeren.
-	NO	SqueezeCenter kan bruke MusicIP-programmet som kilde for tittel- og sjangerinformasjon. I tillegg kan du lage mikser på et øyeblikk ut fra sjanger, artist og sang. Merk av i boksen nedenfor hvis du vil importere biblioteksinformasjon fra MusicIP.
-	SV	SqueezeCenter kan använda MusicIP som källa till titel- och genreinformation. Dessutom kan du snabbt skapa mixer på genre- artist- eller låtnivå.  Markera kryssrutan nedan om du vill att musikbiblioteksinformationen från MusicIP ska importeras.
-	ZH_CN	SqueezeCenter可以使用您的MusicIP节目表作为标题和音乐风格信息的来源。您也能以音乐曲风、艺人和歌曲音量水平生成即时混音。单击如下的复选框以导入您的MusicIP音乐库信息。
+	EN	SqueezeCenter can use your MusicIP program as source for title and genre information. Or you can use it to only generate instant mixes on genre, artist and song level. Reading title and genre information is much slower than reading the mixable status only, especially when scanning for new and changed songs only.
 
 MMMMIXTYPE_TRACKS
 	CS	Číslo skladby
@@ -642,3 +631,8 @@
 	NO	Lag MusicIP-miks
 	SV	Skapa MusicIP Mix
 
+MUSICIP_READSONGDATA
+	EN	Import all song data from MusicIP
+
+MUSICIP_MIXABLE_CHECK
+	EN	Only read mixable status from MusicIP
\ No newline at end of file