[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] ff5644d: Do not store track rating as tags in files.
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2011-01-16 12:06:41
Message-ID: 20110116120641.81B35A6090 () git ! kde ! org
[Download RAW message or body]

commit ff5644d7058b102b5ae850d1c1ab2096f95f5f1a
branch master
Author: Mark Kretschmann <kretschmann@kde.org>
Date:   Sun Jan 16 13:05:49 2011 +0100

    Do not store track rating as tags in files.
    
    Patch by Alan Ezusti <alan.ezust@gmail.com>.
    
    BUG: 259117

diff --git a/ChangeLog b/ChangeLog
index 57b2fce..9147c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ VERSION 2.4.1
   FEATURES:
 
   CHANGES:
+    * Do not store track rating as tags in files. Patch by Alan Ezusti
+      <alan.ezust@gmail.com>. (BR 259117)
     * Added missing tooltip for animation settings. Patch by Bhargav Mangipudi
       <bhargav.1191@gmail.com>. (BR 248690)
 
diff --git a/shared/MetaTagLib.cpp b/shared/MetaTagLib.cpp
index 90e2483..c6ec676 100644
--- a/shared/MetaTagLib.cpp
+++ b/shared/MetaTagLib.cpp
@@ -948,7 +948,8 @@ replaceField( TagLib::FileRef fileref, const qint64 &field, const \
                QVariant &valu
                 tValue = Qt4QStringToTString( QString::number( value.toInt() ) );
             }
 
-            if( field == Meta::valRating || field == Meta::valPlaycount )       \
//tName == "POPM" +            // POPM gets its information from either Rating (if \
available) or playcount (if not) +            if( field == Meta::valRating || field \
== Meta::valPlaycount )  {
                 TagLib::ID3v2::PopularimeterFrame* popFrame = 0;
                 if( !tag->frameListMap()[tName].isEmpty() )
@@ -1168,10 +1169,10 @@ Meta::Tag::writeTags( const QString &path, const FieldHash \
&changes )  foreach( const qint64 field, changes.keys() )
     {
 #ifndef UTILITIES_BUILD
-        // depending on the configuration we might not want to write back statistics
+
+        // Statistics and scores are updated whenever you play a track, so we have a \
separate option for that.  if( !AmarokConfig::writeBackStatistics() &&
             (field == Meta::valScore ||
-             field == Meta::valRating ||
              field == Meta::valFirstPlayed ||
              field == Meta::valLastPlayed ||
              field == Meta::valPlaycount) )
diff --git a/src/dialogs/CollectionSetup.cpp b/src/dialogs/CollectionSetup.cpp
index 0e4839f..ad2562b 100644
--- a/src/dialogs/CollectionSetup.cpp
+++ b/src/dialogs/CollectionSetup.cpp
@@ -144,8 +144,8 @@ CollectionSetup::CollectionSetup( QWidget *parent )
 
     m_recursive->setToolTip( i18n( "If selected, Amarok will read all subfolders." ) \
                );
     m_monitor->setToolTip(   i18n( "If selected, folders will automatically get \
                rescanned\nwhen the content is modified,\ne.g. when a new file was \
                added." ) );
-    m_writeBack->setToolTip( i18n( "Write meta data changes back to the original \
file.\nYou can also prevent writing back by write protecting the file.\nThis might be \
                a good idea if you are currently\nsharing those files via the \
                internet." ) );
-    m_writeBackStatistics->setToolTip( i18n( "Write changed statistics (e.g. rating \
or playcount)\nback to the file." ) ); +    m_writeBack->setToolTip( i18n( "Write \
meta data changes (including 'stars' rating) back to the original file.\nYou can also \
prevent writing back by write protecting the file.\nThis might be a good idea if you \
are currently\nsharing those files via the internet." ) ); +    \
m_writeBackStatistics->setToolTip( i18n( "Write play-changing statistics (e.g. score, \
                lastplayed, playcount)\nas tags back to the file." ) );
     m_writeBackCover->setToolTip( i18n( "Write changed covers back to the \
file.\nThis will replace existing embedded covers." ) );  m_charset->setToolTip(   \
i18n( "If selected, Amarok will use Mozilla's\nCharacter Set Detector to attempt to \
automatically guess the\ncharacter sets used in ID3 tags." ) );  


[prev in list] [next in list] [prev in thread] [next in thread]