[Slim-Checkins] r11035 - in /trunk/server: ./ HTML/EN/html/
HTML/EN/settings/server/
HTML/xmlTelCanto/ Plugins/MoodLogic/ SQL/mysql/ Slim/Buttons/ Slim/Control/
Slim/Music/ Slim/Schema/ Slim/Schema/ResultSet/ Slim/Web/Pages/
Slim/Web/Settings/Server/
dsully at svn.slimdevices.com
dsully at svn.slimdevices.com
Sat Dec 23 10:40:08 PST 2006
Author: dsully
Date: Sat Dec 23 10:40:08 2006
New Revision: 11035
URL: http://svn.slimdevices.com?rev=11035&view=rev
Log:
Bug: N/A
Description: We don't support MoodLogic anymore. MoodLogic doesn't support MoodLogic anymore.
Removed:
trunk/server/Plugins/MoodLogic/
Modified:
trunk/server/HTML/EN/html/help_remote.html
trunk/server/HTML/EN/settings/server/basic.html
trunk/server/HTML/xmlTelCanto/_xml_song_full.html
trunk/server/SQL/mysql/schema_1_up.sql
trunk/server/Slim/Buttons/BrowseDB.pm
trunk/server/Slim/Control/Queries.pm
trunk/server/Slim/Music/Import.pm
trunk/server/Slim/Schema/Contributor.pm
trunk/server/Slim/Schema/Genre.pm
trunk/server/Slim/Schema/ResultSet/Playlist.pm
trunk/server/Slim/Schema/Track.pm
trunk/server/Slim/Web/Pages/BrowseDB.pm
trunk/server/Slim/Web/Settings/Server/Basic.pm
trunk/server/scanner.pl
Modified: trunk/server/HTML/EN/html/help_remote.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/help_remote.html?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/help_remote.html (original)
+++ trunk/server/HTML/EN/html/help_remote.html Sat Dec 23 10:40:08 2006
@@ -32,7 +32,7 @@
<li>A playlist file—the player plays all of the songs within that playlist.
</ul>
</dd>
- <dd><b>Press-and-Hold</b> the PLAY button if you have Moodlogic and the player will create a playlist based on the currently displayed Song, Genre or Artist.</dd>
+ <dd><b>Press-and-Hold</b> the PLAY button if you have MusicIP and the player will create a playlist based on the currently displayed Song, Genre or Artist.</dd>
<dt>ADD</dt>
<dd><b>Press</b> the gray ADD button to add the currently displayed item to the current playlist (the list of songs to play):
<ul>
Modified: trunk/server/HTML/EN/settings/server/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/basic.html?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/basic.html (original)
+++ trunk/server/HTML/EN/settings/server/basic.html Sat Dec 23 10:40:08 2006
@@ -47,7 +47,7 @@
<p><input name="rescan" type="submit" class="stdclick" value="[% "SETUP_RESCAN_BUTTON" | string %]"></p>
</div>
- [% IF prefs.exists('itunes') || prefs.exists('musicmagic') || prefs.exists('moodlogic') %]
+ [% IF prefs.exists('itunes') || prefs.exists('musicmagic') %]
<div class="settingSection">
[% IF prefs.exists('itunes') %]
@@ -73,19 +73,6 @@
</select>
[% END %]
-
- [% IF prefs.exists('moodlogic') %]
- <div class="prefHead">[% "MOODLOGIC" | string | upper %]</div>
- <div class="prefDesc">[% "SETUP_MOODLOGIC_DESC" | string %]</div>
-
- <select class="stdedit" name="moodlogic" id="moodlogic">
-
- <option [% IF NOT prefs.moodlogic %]selected [% END %]value="0">[% 'DONT_USE_MOODLOGIC' | getstring %]</option>
- <option [% IF prefs.moodlogic %]selected [% END %]value="1">[% 'USE_MOODLOGIC' | getstring %]</option>
-
- </select>
- [% END %]
-
</div>
[% END %]
Modified: trunk/server/HTML/xmlTelCanto/_xml_song_full.html
URL: http://svn.slimdevices.com/trunk/server/HTML/xmlTelCanto/_xml_song_full.html?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/HTML/xmlTelCanto/_xml_song_full.html (original)
+++ trunk/server/HTML/xmlTelCanto/_xml_song_full.html Sat Dec 23 10:40:08 2006
@@ -49,6 +49,4 @@
[% IF itemobj.coverArt('cover', 1) %]<coverart><![CDATA[music/[% itemobj.id %]/cover.jpg]]></coverart>[% END %]
- [% IF itemobj.moodlogic_mixable %]<moodlogic_mixable>[% itemobj.moodlogic_mixable | html %]</moodlogic_mixable>[% END %]
-
[% IF itemobj.musicmagic_mixable %]<musicmagic_mixable>[% itemobj.musicmagic_mixable | html %]</musicmagic_mixable>[% END %]
Modified: trunk/server/SQL/mysql/schema_1_up.sql
URL: http://svn.slimdevices.com/trunk/server/SQL/mysql/schema_1_up.sql?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/SQL/mysql/schema_1_up.sql (original)
+++ trunk/server/SQL/mysql/schema_1_up.sql Sat Dec 23 10:40:08 2006
@@ -77,8 +77,6 @@
remote bool,
lossless bool,
lyrics text, -- needs to be text so that searches are case insensitive.
- moodlogic_id int(10) unsigned,
- moodlogic_mixable bool,
musicbrainz_id varchar(40), -- musicbrainz uuid (36 bytes of text)
musicmagic_mixable bool,
replay_gain float,
@@ -174,8 +172,6 @@
namesort text,
namesearch text,
customsearch text,
- moodlogic_id int(10) unsigned,
- moodlogic_mixable bool,
musicbrainz_id varchar(40), -- musicbrainz uuid (36 bytes of text)
musicmagic_mixable bool,
INDEX contributorsNameIndex (name(255)),
@@ -227,8 +223,6 @@
namesort text,
namesearch text,
customsearch text,
- moodlogic_id int(10) unsigned,
- moodlogic_mixable bool,
musicmagic_mixable bool,
INDEX genreNameIndex (name(255)),
INDEX genreSortIndex (namesort(255)),
Modified: trunk/server/Slim/Buttons/BrowseDB.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/BrowseDB.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/BrowseDB.pm (original)
+++ trunk/server/Slim/Buttons/BrowseDB.pm Sat Dec 23 10:40:08 2006
@@ -622,7 +622,8 @@
}
} else {
- # Music Magic is everywhere, MoodLogic doesn't exist on albums
+
+ # Music Magic is everywhere
my $Imports = Slim::Music::Import->importers;
for my $import (keys %{$Imports}) {
Modified: trunk/server/Slim/Control/Queries.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Queries.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Control/Queries.pm (original)
+++ trunk/server/Slim/Control/Queries.pm Sat Dec 23 10:40:08 2006
@@ -1950,8 +1950,6 @@
'm' => ['bpm', 'bpm'], #bpm
'v' => ['tagversion', 'tagversion'], #tagversion
'z' => ['drm', 'drm'], #drm
- # #moodlogic_id
- # #moodlogic_mixable
# #musicmagic_mixable
# #musicbrainz_id
# #playcount
Modified: trunk/server/Slim/Music/Import.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Import.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Music/Import.pm (original)
+++ trunk/server/Slim/Music/Import.pm Sat Dec 23 10:40:08 2006
@@ -92,7 +92,7 @@
}
# Add in the various importer flags
- for my $importer (qw(itunes musicmagic moodlogic)) {
+ for my $importer (qw(itunes musicmagic)) {
if (Slim::Utils::Prefs::get($importer)) {
@@ -569,8 +569,6 @@
L<Plugins::MusicMagic::Importer>
-L<Plugins::MoodLogic::Importer>
-
L<Proc::Background>
=cut
Modified: trunk/server/Slim/Schema/Contributor.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/Contributor.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Schema/Contributor.pm (original)
+++ trunk/server/Slim/Schema/Contributor.pm Sat Dec 23 10:40:08 2006
@@ -26,8 +26,6 @@
id
name
namesort
- moodlogic_id
- moodlogic_mixable
musicmagic_mixable
namesearch
musicbrainz_id
Modified: trunk/server/Slim/Schema/Genre.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/Genre.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Schema/Genre.pm (original)
+++ trunk/server/Slim/Schema/Genre.pm Sat Dec 23 10:40:08 2006
@@ -18,8 +18,6 @@
name
namesort
namesearch
- moodlogic_id
- moodlogic_mixable
musicmagic_mixable
));
Modified: trunk/server/Slim/Schema/ResultSet/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/ResultSet/Playlist.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Schema/ResultSet/Playlist.pm (original)
+++ trunk/server/Slim/Schema/ResultSet/Playlist.pm Sat Dec 23 10:40:08 2006
@@ -91,7 +91,7 @@
# Don't search for playlists if the plugin isn't enabled.
if ($type eq 'all' || $type eq 'external') {
- for my $importer (qw(itunes moodlogic musicmagic)) {
+ for my $importer (qw(itunes musicmagic)) {
if (Slim::Utils::Prefs::get($importer)) {
Modified: trunk/server/Slim/Schema/Track.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/Track.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Schema/Track.pm (original)
+++ trunk/server/Slim/Schema/Track.pm Sat Dec 23 10:40:08 2006
@@ -17,7 +17,7 @@
id url content_type title titlesort titlesearch album tracknum
timestamp filesize disc remote audio audio_size audio_offset year secs
cover vbr_scale bitrate samplerate samplesize channels block_alignment endian
- bpm tagversion drm moodlogic_id moodlogic_mixable musicmagic_mixable
+ bpm tagversion drm musicmagic_mixable
musicbrainz_id playcount lastplayed lossless lyrics rating replay_gain replay_peak
));
Modified: trunk/server/Slim/Web/Pages/BrowseDB.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/BrowseDB.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/BrowseDB.pm (original)
+++ trunk/server/Slim/Web/Pages/BrowseDB.pm Sat Dec 23 10:40:08 2006
@@ -202,10 +202,10 @@
}
}
- # Bug 3311, disable editing for iTunes, MoodLogic, and MusicMagic playlists
+ # Bug 3311, disable editing for iTunes and MusicMagic playlists
if (ref $params->{'playlist'}) {
- if ($params->{'playlist'}->content_type =~ /(?:itu|mlp|mmp)/) {
+ if ($params->{'playlist'}->content_type =~ /(?:itu|mmp)/) {
$params->{'noEdit'} = 1;
}
Modified: trunk/server/Slim/Web/Settings/Server/Basic.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Basic.pm?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Basic.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Basic.pm Sat Dec 23 10:40:08 2006
@@ -25,7 +25,7 @@
my @prefs = qw(language audiodir playlistdir rescantype rescan);
- for my $importer (qw(iTunes MusicMagic MoodLogic)) {
+ for my $importer (qw(iTunes MusicMagic)) {
if (exists $Slim::Music::Import::Importers{"Plugins::".$importer."::Plugin"}) {
push @prefs, lc($importer);
Modified: trunk/server/scanner.pl
URL: http://svn.slimdevices.com/trunk/server/scanner.pl?rev=11035&r1=11034&r2=11035&view=diff
==============================================================================
--- trunk/server/scanner.pl (original)
+++ trunk/server/scanner.pl Sat Dec 23 10:40:08 2006
@@ -45,7 +45,7 @@
sub main {
- our ($rescan, $playlists, $wipe, $itunes, $musicmagic, $moodlogic, $force, $cleanup, $prefsFile, $progress, $priority);
+ our ($rescan, $playlists, $wipe, $itunes, $musicmagic, $force, $cleanup, $prefsFile, $progress, $priority);
our ($quiet, $logfile, $logdir, $logconf, $debug);
our $LogTimestamp = 1;
@@ -58,7 +58,6 @@
'playlists' => \$playlists,
'itunes' => \$itunes,
'musicmagic' => \$musicmagic,
- 'moodlogic' => \$moodlogic,
'prefsfile=s' => \$prefsFile,
'progress' => \$progress,
'priority=i' => \$priority,
@@ -70,7 +69,7 @@
'LogTimestamp!'=> \$LogTimestamp,
);
- if (!$rescan && !$wipe && !$playlists && !$musicmagic && !$moodlogic && !$itunes && !scalar @ARGV) {
+ if (!$rescan && !$wipe && !$playlists && !$musicmagic && !$itunes && !scalar @ARGV) {
usage();
exit;
}
@@ -124,10 +123,6 @@
if ($musicmagic) {
initClass('Plugins::MusicMagic::Importer');
- }
-
- if ($moodlogic) {
- initClass('Plugins::MoodLogic::Importer');
}
#checkDataSource();
@@ -250,7 +245,7 @@
sub usage {
print <<EOF;
-Usage: $0 [debug options] [--rescan] [--wipe] [--itunes] [--musicmagic] [--moodlogic] <path or URL>
+Usage: $0 [debug options] [--rescan] [--wipe] [--itunes] [--musicmagic] <path or URL>
Command line options:
@@ -261,7 +256,6 @@
--playlists Only scan files in your playlistdir.
--itunes Run the iTunes Importer.
--musicmagic Run the MusicMagic/MusicIP Importer.
- --moodlogic Run the MoodLogic Importer.
--progress Show a progress bar of the scan.
--prefsfile Specify an alternate prefs file.
--priority set process priority from -20 (high) to 20 (low)
More information about the checkins
mailing list