prepare for multicolumn support implementation

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4745 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 30 insertions, 18 deletions

diff --git a/src/qmmpui/playlistgroup.cpp b/src/qmmpui/playlistgroup.cpp
index ad3a5bc16..ede365d89 100644
--- a/src/qmmpui/playlistgroup.cpp
+++ b/src/qmmpui/playlistgroup.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -38,8 +38,9 @@ PlayListGroup::~PlayListGroup()
     }
 }
 
-const QString PlayListGroup::formattedTitle()
+const QString PlayListGroup::formattedTitle(int column)
 {
+    Q_UNUSED(column);
     return m_name;
 }
 
diff --git a/src/qmmpui/playlistgroup.h b/src/qmmpui/playlistgroup.h
index 2a9f3be3a..8db56c1ed 100644
--- a/src/qmmpui/playlistgroup.h
+++ b/src/qmmpui/playlistgroup.h
@@ -43,8 +43,9 @@ public:
     virtual ~PlayListGroup();
     /*!
      * Returns formatted title of the  group.
+     * @param column Number of column (unused).
      */
-    const QString formattedTitle();
+    const QString formattedTitle(int column = 0);
     /*!
      * Returns \b true if the group contains track \b track.
      * Otherwise returns \b false.
diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h
index 5739db5be..0ec73e372 100644
--- a/src/qmmpui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
@@ -50,8 +50,9 @@ public:
     bool isSelected() const;
     /*!
      * Returns formatted title of the item.
+     * @param column Number of column.
      */
-    virtual const QString formattedTitle() = 0;
+    virtual const QString formattedTitle(int column = 0) = 0;
     /*!
      *  Returns formatted length of the item.
      */
diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp
index b9262c72b..f1c8d2fca 100644
--- a/src/qmmpui/playlisttrack.cpp
+++ b/src/qmmpui/playlisttrack.cpp
@@ -126,8 +126,9 @@ bool PlayListTrack::isUsed() const
     return (m_refCount != 0);
 }
 
-const QString PlayListTrack::formattedTitle()
+const QString PlayListTrack::formattedTitle(int column)
 {
+    Q_UNUSED(column);
     if(m_formattedTitle.isEmpty() || m_titleFormat != m_settings->titleFormat())
     {
         m_titleFormat = m_settings->titleFormat();
diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h
index 810be411a..aa7ab59fb 100644
--- a/src/qmmpui/playlisttrack.h
+++ b/src/qmmpui/playlisttrack.h
@@ -52,8 +52,9 @@ public:
     virtual ~PlayListTrack();
     /*!
      * Returns formatted title of the item.
+     * @param column Number of column.
      */
-    const QString formattedTitle();
+    const QString formattedTitle(int column = 0);
     /*!
      *  Returns formatted length of the item.
      */
diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index c7355ecb3..53c137a05 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -34,7 +34,8 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     m_instance = this;
     QSettings s (Qmmp::configFile(), QSettings::IniFormat);
     s.beginGroup("PlayList");
-    m_title_format = s.value("title_format", "%p%if(%p&%t, - ,)%t").toString();
+    m_title_formats = s.value("title_formats", QStringList() << "%p%if(%p&%t, - ,)%t")
+            .toStringList();
     m_group_format = s.value("group_format", "%p%if(%p&%a, - %if(%y,[%y] ,),)%a").toString();
     m_convertUnderscore = s.value ("convert_underscore", true).toBool();
     m_convertTwenty = s.value ("convert_twenty", true).toBool();
@@ -61,18 +62,23 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     connect(m_timer, SIGNAL(timeout()), SLOT(sync()));
 
     m_group_formatter.setPattern(m_group_format);
-    m_title_formatter.setPattern(m_title_format);
+
+    foreach (QString pattern, m_title_formats)
+    {
+        m_title_formatters << new MetaDataFormatter(pattern);
+    }
 }
 
 QmmpUiSettings::~QmmpUiSettings()
 {
     m_instance = 0;
     sync();
+    qDeleteAll(m_title_formatters);
 }
 
 const QString QmmpUiSettings::titleFormat() const
 {
-    return m_title_format;
+    return m_title_formats.first();
 }
 
 const QString QmmpUiSettings::groupFormat() const
@@ -132,10 +138,10 @@ void  QmmpUiSettings::setConvertTwenty(bool yes)
 
 void QmmpUiSettings::setTitleFormat(const QString &titleFormat)
 {
-    if(titleFormat != m_title_format)
+    if(titleFormat != m_title_formats.first())
     {
-        m_title_format = titleFormat;
-        m_title_formatter.setPattern(titleFormat);
+        m_title_formats[0] = titleFormat;
+        m_title_formatters[0]->setPattern(titleFormat);
         foreach(PlayListModel *model, PlayListManager::instance()->playLists())
         {
             model->updateMetaData();
@@ -185,7 +191,7 @@ void QmmpUiSettings::sync()
 {
     qDebug("%s", Q_FUNC_INFO);
     QSettings s(Qmmp::configFile(), QSettings::IniFormat);
-    s.setValue("PlayList/title_format", m_title_format);
+    s.setValue("PlayList/title_formats", m_title_formats);
     s.setValue("PlayList/group_format", m_group_format);
     s.setValue("PlayList/convert_underscore", m_convertUnderscore);
     s.setValue("PlayList/convert_twenty", m_convertTwenty);
@@ -318,9 +324,9 @@ bool QmmpUiSettings::clearPreviousPlayList() const
     return m_clear_prev_playlist;
 }
 
-const MetaDataFormatter *QmmpUiSettings::titleFormatter() const
+const MetaDataFormatter *QmmpUiSettings::titleFormatter(int column) const
 {
-    return &m_title_formatter;
+    return m_title_formatters[column];
 }
 
 const MetaDataFormatter *QmmpUiSettings::groupFormatter() const
diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h
index 0380135ca..61d62f033 100644
--- a/src/qmmpui/qmmpuisettings.h
+++ b/src/qmmpui/qmmpuisettings.h
@@ -182,7 +182,7 @@ public:
      */
     bool clearPreviousPlayList() const;
 
-    const MetaDataFormatter* titleFormatter() const;
+    const MetaDataFormatter* titleFormatter(int column = 0) const;
     const MetaDataFormatter* groupFormatter() const;
 
     /*!
@@ -256,7 +256,7 @@ private slots:
 private:
     static QmmpUiSettings* m_instance;
     //playlist
-    QString m_title_format;
+    QStringList m_title_formats;
     QString m_group_format;
     bool m_convertUnderscore, m_convertTwenty;
     bool m_useMetadata;
@@ -278,7 +278,8 @@ private:
     //timer
     QTimer *m_timer;
     //formatters
-    MetaDataFormatter m_group_formatter, m_title_formatter;
+    MetaDataFormatter m_group_formatter;
+    QList<MetaDataFormatter *> m_title_formatters;
 };
 
 #endif // QMMPUISETTINGS_H