Merge lp:~jonathan-costers/mixxx/LP878931 into lp:~mixxxdevelopers/mixxx/trunk

[Jonathan Costers]

Add Composer field to the library:
- DB revision 14, adding composer field to library table
- updated relevant models and DAOs
- updated library ui and track info dialog to show new field
- integrated new field with existing tag reading/writing

[lp:~jonathan-costers/mixxx/LP878931]

2983. By jonathan on 2011-12-28

use empty string as default value for composer field, instead of "?"

[RJ Skerry-Ryan (rryan)]

Thanks Jonathan! I'll get the code reviewed this weekend.

[RJ Skerry-Ryan (rryan)]

Looks good to me! Thanks Jonathan and nice job on making your code blend in with wherever you were writing it. As you have surely noticed there are a variety of different styles of code lurking around the codebase :).

I have one question. Is there a standard composer field for M4A files? I noticed you haven't updated SoundSource::processMP4Tag to look for one.

Is it ok if I add you to the credits as "Jonathan Costers"?

I'm merging this to trunk now and it will be in the 1.11.0 release later this year.

review: Approve

[Jonathan Costers (jonathan-costers)]

Haha, yes I did notice.
Not a lot different from any other projects I've been involved with in the past, for that matter :-)

I must have overlooked M4A tagging ... Let me find out.

Thanks for adding me to the credits! Jonathan Costers is quite alright.

[RJ Skerry-Ryan (rryan)]

I actually found a reference here:
http://atomicparsley.sourceforge.net/mpeg-4files.html

And added the appropriate parsing to trunk last night but I didn't test it.

On Sat, Jan 7, 2012 at 6:52 AM, Jonathan Costers <<email address hidden>
> wrote:

> Haha, yes I did notice.
> Not a lot different from any other projects I've been involved with in the
> past, for that matter :-)
>
> I must have overlooked M4A tagging ... Let me find out.
>
> Thanks for adding me to the credits! Jonathan Costers is quite alright.
> --
> https://code.launchpad.net/~jonathan-costers/mixxx/LP878931/+merge/87046
> You are reviewing the proposed merge of
> lp:~jonathan-costers/mixxx/LP878931 into lp:mixxx.
>

=== added file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	1970-01-01 00:00:00 +0000
+++ mixxx/res/schema.xml	2011-12-28 23:47:25 +0000
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This is the Mixxx schema history file. It keeps track of internal changes to the
+Mixxx database schema and allows Mixxx to automatically upgrade itself to new
+revisions of the schema on a version upgrade.
+
+DO NOT EDIT THIS FILE OR YOU WILL BREAK YOUR MIXXX LIBRARY AND LOSE YOUR
+METADATA
+-->
+<schema>
+  <revision version="1">
+    <description>
+      The base schema for the Mixxx SQLITE database.
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS settings (
+        name TEXT UNIQUE NOT NULL,
+        value TEXT,
+        locked INTEGER DEFAULT 0,
+        hidden INTEGER DEFAULT 0);
+
+      CREATE TABLE IF NOT EXISTS track_locations (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        location varchar(512) UNIQUE,
+        filename varchar(512),
+        directory varchar(512),
+        filesize INTEGER,
+        fs_deleted INTEGER,
+        needs_verification INTEGER);
+
+      CREATE TABLE IF NOT EXISTS LibraryHashes (
+        directory_path VARCHAR(256) primary key,
+        hash INTEGER,
+        directory_deleted INTEGER);
+
+      CREATE TABLE IF NOT EXISTS library (
+        id INTEGER primary key AUTOINCREMENT,
+        artist varchar(48), title varchar(48),
+        album varchar(48), year varchar(16),
+        genre varchar(32), tracknumber varchar(3),
+        location varchar(512) REFERENCES track_locations(location),
+        comment varchar(20), url varchar(256),
+        duration integer,
+        bitrate integer, samplerate integer,
+        cuepoint integer, bpm float,
+        wavesummaryhex blob,
+        channels integer,
+        datetime_added DEFAULT CURRENT_TIMESTAMP,
+        mixxx_deleted integer,
+        played integer);
+
+      CREATE TABLE Playlists (
+        id INTEGER primary key,
+        name varchar(48),
+        position INTEGER,
+        hidden INTEGER DEFAULT 0 NOT NULL,
+        date_created datetime,
+        date_modified datetime);
+
+      CREATE TABLE PlaylistTracks (
+        id INTEGER primary key,
+        playlist_id INTEGER REFERENCES Playlists(id),
+        track_id INTEGER REFERENCES library(id),
+        position INTEGER);
+
+      CREATE TABLE IF NOT EXISTS cues (
+        id integer PRIMARY KEY AUTOINCREMENT,
+        track_id integer NOT NULL REFERENCES library(id),
+        type integer DEFAULT 0 NOT NULL,
+        position integer DEFAULT -1 NOT NULL,
+        length integer DEFAULT 0 NOT NULL,
+        hotcue integer DEFAULT -1 NOT NULL,
+        label text DEFAULT '' NOT NULL);
+
+      CREATE TABLE IF NOT EXISTS crates (
+        id integer PRIMARY KEY AUTOINCREMENT,
+        name varchar(48) UNIQUE NOT NULL,
+        count integer DEFAULT 0,
+        show integer DEFAULT 1);
+
+      CREATE TABLE IF NOT EXISTS crate_tracks (
+        crate_id integer NOT NULL REFERENCES crates(id),
+        track_id integer NOT NULL REFERENCES library(id),
+        UNIQUE (crate_id, track_id));
+
+    </sql>
+  </revision>
+  <revision version="2">
+    <description>
+      Add a header_parsed integer column to the library to indicate when a
+      track's tags have been parsed.
+    </description>
+    <sql>
+      ALTER TABLE library ADD COLUMN header_parsed integer DEFAULT 0;
+    </sql>
+  </revision>
+  <revision version="3">
+    <description>
+      Change the location column to be a an integer. Change comment to be
+      varchar(256) and album/artist/title to be varchar(64).
+    </description>
+    <sql>
+      ALTER TABLE library RENAME TO library_old;
+
+      CREATE TABLE IF NOT EXISTS library (
+        id INTEGER primary key AUTOINCREMENT,
+        artist varchar(64),
+        title varchar(64),
+        album varchar(64),
+        year varchar(16),
+        genre varchar(64),
+        tracknumber varchar(3),
+        location integer REFERENCES track_locations(location),
+        comment varchar(256),
+        url varchar(256),
+        duration integer,
+        bitrate integer,
+        samplerate integer,
+        cuepoint integer,
+        bpm float,
+        wavesummaryhex blob,
+        channels integer,
+        datetime_added DEFAULT CURRENT_TIMESTAMP,
+        mixxx_deleted integer,
+        played integer,
+        header_parsed integer DEFAULT 0);
+
+      INSERT INTO library (id, artist, title, album, year, genre, tracknumber, location, comment, url, duration, bitrate, samplerate, bpm, cuepoint, bpm, wavesummaryhex, channels, datetime_added, mixxx_deleted, played, header_parsed) SELECT id, artist, title, album, year, genre, tracknumber, location, comment, url, duration, bitrate, samplerate, bpm, cuepoint, bpm, wavesummaryhex, channels, datetime_added, mixxx_deleted, played, header_parsed from library_old;
+
+      DROP TABLE library_old;
+    </sql>
+  </revision>
+  <revision version="4">
+    <description>
+      Add file type column.
+    </description>
+    <sql>
+      ALTER TABLE library ADD COLUMN filetype varchar(8) DEFAULT "?";
+    </sql>
+  </revision>
+  <revision version="5">
+    <description>
+      Add needs_verification column to library hashes table.
+    </description>
+    <sql>
+      ALTER TABLE LibraryHashes ADD COLUMN needs_verification INTEGER DEFAULT 0;
+    </sql>
+  </revision>
+  <revision version="6">
+    <description>
+                    Added a ReplayGain Column.
+    </description>
+    <sql>
+        ALTER TABLE library ADD COLUMN replaygain float DEFAULT 0;
+    </sql>
+  </revision>
+  <revision version="7" min_compatible="3">
+    <description>
+      Add timesplayed and rating column. Reset header state.
+    </description>
+    <sql>
+      ALTER TABLE library ADD COLUMN timesplayed integer DEFAULT 0;
+      ALTER TABLE library ADD COLUMN rating integer DEFAULT 0;
+      ALTER TABLE library ADD COLUMN key varchar(8) DEFAULT "";
+      UPDATE library SET timesplayed = played;
+      UPDATE library SET played = 0;
+
+      DELETE FROM settings WHERE name="mixxx.db.model.library.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.playlist.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.crate.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.prepare.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.missing.header_state";
+    </sql>
+  </revision>
+  <revision version="8" min_compatible="3">
+    <description>
+      Added iTunes tables
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS itunes_library (
+        id INTEGER primary key,
+        artist varchar(48), title varchar(48),
+        album varchar(48), year varchar(16),
+        genre varchar(32), tracknumber varchar(3),
+        location varchar(512),
+        comment varchar(60),
+        duration integer,
+        bitrate integer,
+        bpm integer,
+        rating integer);
+
+       CREATE TABLE IF NOT EXISTS itunes_playlists (
+        id INTEGER primary key,
+        name varchar(100) UNIQUE);
+
+      CREATE TABLE IF NOT EXISTS itunes_playlist_tracks (
+        id INTEGER primary key AUTOINCREMENT,
+        playlist_id INTEGER REFERENCES itunes_playlist(id),
+        track_id INTEGER REFERENCES itunes_library(id));
+    </sql>
+  </revision>
+  <revision version="9" min_compatible="3">
+    <description>
+      Tables for Traktor library feature
+    </description>
+    <sql>
+     CREATE TABLE IF NOT EXISTS traktor_library (
+        id INTEGER primary key AUTOINCREMENT,
+        artist varchar(48), title varchar(48),
+        album varchar(48), year varchar(16),
+        genre varchar(32), tracknumber varchar(3),
+        location varchar(512) UNIQUE,
+        comment varchar(60),
+        duration integer,
+        bitrate integer,
+        bpm float,
+        key varchar(6),
+        rating integer
+        );
+      CREATE TABLE IF NOT EXISTS traktor_playlists (
+        id INTEGER primary key,
+        name varchar(100) UNIQUE
+        );
+      CREATE TABLE IF NOT EXISTS traktor_playlist_tracks (
+        id INTEGER primary key AUTOINCREMENT,
+        playlist_id INTEGER REFERENCES traktor_playlist(id),
+        track_id INTEGER REFERENCES traktor_library(id)
+        );
+    </sql>
+  </revision>
+  <revision version="10" min_compatible="3">
+    <description>
+      Playlist and crate locks
+    </description>
+    <sql>
+      ALTER TABLE crates ADD COLUMN locked integer DEFAULT 0;
+      ALTER TABLE playlists ADD COLUMN locked integer DEFAULT 0;
+    </sql>
+  </revision>
+  <revision version="11" min_compatible="3">
+    <description>
+      Tables for Rhythmbox library feature
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS rhythmbox_library (
+        id INTEGER primary key AUTOINCREMENT,
+        artist varchar(48), title varchar(48),
+        album varchar(48), year varchar(16),
+        genre varchar(32), tracknumber varchar(3),
+        location varchar(512) UNIQUE,
+        comment varchar(60),
+        duration integer,
+        bitrate integer,
+        bpm float,
+        key varchar(6),
+        rating integer
+        );
+      CREATE TABLE IF NOT EXISTS rhythmbox_playlists (
+        id INTEGER primary key AUTOINCREMENT,
+        name varchar(100) UNIQUE
+        );
+      CREATE TABLE IF NOT EXISTS rhythmbox_playlist_tracks (
+        id INTEGER primary key AUTOINCREMENT,
+        playlist_id INTEGER REFERENCES rhythmbox_playlist(id),
+        track_id INTEGER REFERENCES rhythmbox_library(id)
+        );
+    </sql>
+  </revision>
+  <revision version="12" min_compatible="3">
+    <description>
+      Add beats column to library table.
+    </description>
+    <sql>
+      ALTER TABLE Library ADD COLUMN beats BLOB;
+      ALTER TABLE Library ADD COLUMN beats_version TEXT;
+    </sql>
+  </revision>
+  <revision version="13" min_compatible="3">
+    <description>
+      Add position column to Rhythmbox, iTunes, and Traktor playlist tables.
+    </description>
+    <sql>
+      ALTER TABLE itunes_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
+      ALTER TABLE rhythmbox_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
+      ALTER TABLE traktor_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
+    </sql>
+  </revision>
+  <revision version="14" min_compatible="3">
+    <description>
+      Add composer column to library table.
+    </description>
+    <sql>
+      ALTER TABLE library ADD COLUMN composer varchar(64) DEFAULT "";
+    </sql>
+  </revision>
+</schema>

=== removed file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2011-10-14 00:24:59 +0000
+++ mixxx/res/schema.xml	1970-01-01 00:00:00 +0000
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This is the Mixxx schema history file. It keeps track of internal changes to the
-Mixxx database schema and allows Mixxx to automatically upgrade itself to new
-revisions of the schema on a version upgrade.
-
-DO NOT EDIT THIS FILE OR YOU WILL BREAK YOUR MIXXX LIBRARY AND LOSE YOUR
-METADATA
--->
-<schema>
-  <revision version="1">
-    <description>
-      The base schema for the Mixxx SQLITE database.
-    </description>
-    <sql>
-      CREATE TABLE IF NOT EXISTS settings (
-        name TEXT UNIQUE NOT NULL,
-        value TEXT,
-        locked INTEGER DEFAULT 0,
-        hidden INTEGER DEFAULT 0);
-
-      CREATE TABLE IF NOT EXISTS track_locations (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        location varchar(512) UNIQUE,
-        filename varchar(512),
-        directory varchar(512),
-        filesize INTEGER,
-        fs_deleted INTEGER,
-        needs_verification INTEGER);
-
-      CREATE TABLE IF NOT EXISTS LibraryHashes (
-        directory_path VARCHAR(256) primary key,
-        hash INTEGER,
-        directory_deleted INTEGER);
-
-      CREATE TABLE IF NOT EXISTS library (
-        id INTEGER primary key AUTOINCREMENT,
-        artist varchar(48), title varchar(48),
-        album varchar(48), year varchar(16),
-        genre varchar(32), tracknumber varchar(3),
-        location varchar(512) REFERENCES track_locations(location),
-        comment varchar(20), url varchar(256),
-        duration integer,
-        bitrate integer, samplerate integer,
-        cuepoint integer, bpm float,
-        wavesummaryhex blob,
-        channels integer,
-        datetime_added DEFAULT CURRENT_TIMESTAMP,
-        mixxx_deleted integer,
-        played integer);
-
-      CREATE TABLE Playlists (
-        id INTEGER primary key,
-        name varchar(48),
-        position INTEGER,
-        hidden INTEGER DEFAULT 0 NOT NULL,
-        date_created datetime,
-        date_modified datetime);
-
-      CREATE TABLE PlaylistTracks (
-        id INTEGER primary key,
-        playlist_id INTEGER REFERENCES Playlists(id),
-        track_id INTEGER REFERENCES library(id),
-        position INTEGER);
-
-      CREATE TABLE IF NOT EXISTS cues (
-        id integer PRIMARY KEY AUTOINCREMENT,
-        track_id integer NOT NULL REFERENCES library(id),
-        type integer DEFAULT 0 NOT NULL,
-        position integer DEFAULT -1 NOT NULL,
-        length integer DEFAULT 0 NOT NULL,
-        hotcue integer DEFAULT -1 NOT NULL,
-        label text DEFAULT '' NOT NULL);
-
-      CREATE TABLE IF NOT EXISTS crates (
-        id integer PRIMARY KEY AUTOINCREMENT,
-        name varchar(48) UNIQUE NOT NULL,
-        count integer DEFAULT 0,
-        show integer DEFAULT 1);
-
-      CREATE TABLE IF NOT EXISTS crate_tracks (
-        crate_id integer NOT NULL REFERENCES crates(id),
-        track_id integer NOT NULL REFERENCES library(id),
-        UNIQUE (crate_id, track_id));
-
-    </sql>
-  </revision>
-  <revision version="2">
-    <description>
-      Add a header_parsed integer column to the library to indicate when a
-      track's tags have been parsed.
-    </description>
-    <sql>
-      ALTER TABLE library ADD COLUMN header_parsed integer DEFAULT 0;
-    </sql>
-  </revision>
-  <revision version="3">
-    <description>
-      Change the location column to be a an integer. Change comment to be
-      varchar(256) and album/artist/title to be varchar(64).
-    </description>
-    <sql>
-      ALTER TABLE library RENAME TO library_old;
-
-      CREATE TABLE IF NOT EXISTS library (
-        id INTEGER primary key AUTOINCREMENT,
-        artist varchar(64),
-        title varchar(64),
-        album varchar(64),
-        year varchar(16),
-        genre varchar(64),
-        tracknumber varchar(3),
-        location integer REFERENCES track_locations(location),
-        comment varchar(256),
-        url varchar(256),
-        duration integer,
-        bitrate integer,
-        samplerate integer,
-        cuepoint integer,
-        bpm float,
-        wavesummaryhex blob,
-        channels integer,
-        datetime_added DEFAULT CURRENT_TIMESTAMP,
-        mixxx_deleted integer,
-        played integer,
-        header_parsed integer DEFAULT 0);
-
-      INSERT INTO library (id, artist, title, album, year, genre, tracknumber, location, comment, url, duration, bitrate, samplerate, bpm, cuepoint, bpm, wavesummaryhex, channels, datetime_added, mixxx_deleted, played, header_parsed) SELECT id, artist, title, album, year, genre, tracknumber, location, comment, url, duration, bitrate, samplerate, bpm, cuepoint, bpm, wavesummaryhex, channels, datetime_added, mixxx_deleted, played, header_parsed from library_old;
-
-      DROP TABLE library_old;
-    </sql>
-  </revision>
-  <revision version="4">
-    <description>
-      Add file type column.
-    </description>
-    <sql>
-      ALTER TABLE library ADD COLUMN filetype varchar(8) DEFAULT "?";
-    </sql>
-  </revision>
-  <revision version="5">
-    <description>
-      Add needs_verification column to library hashes table.
-    </description>
-    <sql>
-      ALTER TABLE LibraryHashes ADD COLUMN needs_verification INTEGER DEFAULT 0;
-    </sql>
-  </revision>
-  <revision version="6">
-    <description>
-                    Added a ReplayGain Column.
-    </description>
-    <sql>
-        ALTER TABLE library ADD COLUMN replaygain float DEFAULT 0;
-    </sql>
-  </revision>
-  <revision version="7" min_compatible="3">
-    <description>
-      Add timesplayed and rating column. Reset header state.
-    </description>
-    <sql>
-      ALTER TABLE library ADD COLUMN timesplayed integer DEFAULT 0;
-      ALTER TABLE library ADD COLUMN rating integer DEFAULT 0;
-      ALTER TABLE library ADD COLUMN key varchar(8) DEFAULT "";
-      UPDATE library SET timesplayed = played;
-      UPDATE library SET played = 0;
-
-      DELETE FROM settings WHERE name="mixxx.db.model.library.header_state";
-      DELETE FROM settings WHERE name="mixxx.db.model.playlist.header_state";
-      DELETE FROM settings WHERE name="mixxx.db.model.crate.header_state";
-      DELETE FROM settings WHERE name="mixxx.db.model.prepare.header_state";
-      DELETE FROM settings WHERE name="mixxx.db.model.missing.header_state";
-    </sql>
-  </revision>
-  <revision version="8" min_compatible="3">
-    <description>
-      Added iTunes tables
-    </description>
-    <sql>
-      CREATE TABLE IF NOT EXISTS itunes_library (
-        id INTEGER primary key,
-        artist varchar(48), title varchar(48),
-        album varchar(48), year varchar(16),
-        genre varchar(32), tracknumber varchar(3),
-        location varchar(512),
-        comment varchar(60),
-        duration integer,
-        bitrate integer,
-        bpm integer,
-        rating integer);
-
-       CREATE TABLE IF NOT EXISTS itunes_playlists (
-        id INTEGER primary key,
-        name varchar(100) UNIQUE);
-
-      CREATE TABLE IF NOT EXISTS itunes_playlist_tracks (
-        id INTEGER primary key AUTOINCREMENT,
-        playlist_id INTEGER REFERENCES itunes_playlist(id),
-        track_id INTEGER REFERENCES itunes_library(id));
-    </sql>
-  </revision>
-  <revision version="9" min_compatible="3">
-    <description>
-      Tables for Traktor library feature
-    </description>
-    <sql>
-     CREATE TABLE IF NOT EXISTS traktor_library (
-        id INTEGER primary key AUTOINCREMENT,
-        artist varchar(48), title varchar(48),
-        album varchar(48), year varchar(16),
-        genre varchar(32), tracknumber varchar(3),
-        location varchar(512) UNIQUE,
-        comment varchar(60),
-        duration integer,
-        bitrate integer,
-        bpm float,
-        key varchar(6),
-        rating integer
-        );
-      CREATE TABLE IF NOT EXISTS traktor_playlists (
-        id INTEGER primary key,
-        name varchar(100) UNIQUE
-        );
-      CREATE TABLE IF NOT EXISTS traktor_playlist_tracks (
-        id INTEGER primary key AUTOINCREMENT,
-        playlist_id INTEGER REFERENCES traktor_playlist(id),
-        track_id INTEGER REFERENCES traktor_library(id)
-        );
-    </sql>
-  </revision>
-  <revision version="10" min_compatible="3">
-    <description>
-      Playlist and crate locks
-    </description>
-    <sql>
-      ALTER TABLE crates ADD COLUMN locked integer DEFAULT 0;
-      ALTER TABLE playlists ADD COLUMN locked integer DEFAULT 0;
-    </sql>
-  </revision>
-  <revision version="11" min_compatible="3">
-    <description>
-      Tables for Rhythmbox library feature
-    </description>
-    <sql>
-      CREATE TABLE IF NOT EXISTS rhythmbox_library (
-        id INTEGER primary key AUTOINCREMENT,
-        artist varchar(48), title varchar(48),
-        album varchar(48), year varchar(16),
-        genre varchar(32), tracknumber varchar(3),
-        location varchar(512) UNIQUE,
-        comment varchar(60),
-        duration integer,
-        bitrate integer,
-        bpm float,
-        key varchar(6),
-        rating integer
-        );
-      CREATE TABLE IF NOT EXISTS rhythmbox_playlists (
-        id INTEGER primary key AUTOINCREMENT,
-        name varchar(100) UNIQUE
-        );
-      CREATE TABLE IF NOT EXISTS rhythmbox_playlist_tracks (
-        id INTEGER primary key AUTOINCREMENT,
-        playlist_id INTEGER REFERENCES rhythmbox_playlist(id),
-        track_id INTEGER REFERENCES rhythmbox_library(id)
-        );
-    </sql>
-  </revision>
-  <revision version="12" min_compatible="3">
-    <description>
-      Add beats column to library table.
-    </description>
-    <sql>
-      ALTER TABLE Library ADD COLUMN beats BLOB;
-      ALTER TABLE Library ADD COLUMN beats_version TEXT;
-    </sql>
-  </revision>
-  <revision version="13" min_compatible="3">
-    <description>
-      Add position column to Rhythmbox, iTunes, and Traktor playlist tables.
-    </description>
-    <sql>
-      ALTER TABLE itunes_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
-      ALTER TABLE rhythmbox_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
-      ALTER TABLE traktor_playlist_tracks ADD COLUMN position INTEGER DEFAULT 0;
-    </sql>
-  </revision>
-</schema>

=== modified file 'mixxx/src/audiotagger.cpp'
--- mixxx/src/audiotagger.cpp	2011-04-15 11:09:14 +0000
+++ mixxx/src/audiotagger.cpp	2011-12-28 23:47:25 +0000
@@ -26,6 +26,7 @@
     m_artist = "";
     m_title = "";
     m_genre = "";
+    m_composer = "";
     m_album = "";
     m_year = "";
     m_comment = "";
@@ -69,6 +70,11 @@
 }
 
 
+void AudioTagger::setComposer (QString composer )
+{
+    m_composer = composer;
+}
+
 
 void AudioTagger::setYear (QString year )
 {
@@ -219,6 +225,22 @@
 
     }
 
+    TagLib::ID3v2::FrameList composerFrame = id3v2->frameListMap()["TCOM"];
+	if (!composerFrame.isEmpty())
+	{
+		composerFrame.front()->setText(m_composer.toStdString());
+
+	}
+	else
+	{
+		//add new frame
+		TagLib::ID3v2::TextIdentificationFrame* newFrame = new TagLib::ID3v2::TextIdentificationFrame("TCOM", TagLib::String::Latin1);
+
+		newFrame->setText(m_composer.toStdString());
+		id3v2->addFrame(newFrame);
+
+	}
+
 }
 void AudioTagger::addAPETag(TagLib::APE::Tag* ape)
 {
@@ -230,6 +252,7 @@
     ape->addValue("BPM",m_bpm.toStdString(), true);
     ape->addValue("BPM",m_bpm.toStdString(), true);
 
+    ape->addValue("Composer",m_composer.toStdString(), true);
 
 }
 void AudioTagger::addXiphComment(TagLib::Ogg::XiphComment* xiph)
@@ -252,6 +275,9 @@
     xiph->removeField("KEY");
     xiph->addField("KEY", m_key.toStdString());
 
+    xiph->removeField("COMPOSER");
+    xiph->addField("COMPOSER", m_key.toStdString());
+
 }
 void AudioTagger::processMP4Tag(TagLib::MP4::Tag* mp4)
 {

=== modified file 'mixxx/src/audiotagger.h'
--- mixxx/src/audiotagger.h	2011-04-10 18:23:52 +0000
+++ mixxx/src/audiotagger.h	2011-12-28 23:47:25 +0000
@@ -21,6 +21,7 @@
     void setTitle (QString title );
     void setAlbum (QString album );
     void setGenre (QString genre );
+    void setComposer (QString composer );
     void setYear (QString year );
     void setComment (QString comment );
     void setKey (QString key );
@@ -33,6 +34,7 @@
     QString m_artist;
     QString m_title;
     QString m_genre;
+    QString m_composer;
     QString m_album;
     QString m_year;
     QString m_comment;

=== modified file 'mixxx/src/dlgtrackinfo.cpp'
--- mixxx/src/dlgtrackinfo.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/dlgtrackinfo.cpp	2011-12-28 23:47:25 +0000
@@ -103,6 +103,7 @@
     txtArtist->setText(pTrack->getArtist());
     txtAlbum->setText(pTrack->getAlbum());
     txtGenre->setText(pTrack->getGenre());
+    txtComposer->setText(pTrack->getComposer());
     txtYear->setText(pTrack->getYear());
     txtTrackNumber->setText(pTrack->getTrackNumber());
     txtComment->setText(pTrack->getComment());
@@ -198,6 +199,7 @@
         m_pLoadedTrack->setArtist(txtArtist->text());
         m_pLoadedTrack->setAlbum(txtAlbum->text());
         m_pLoadedTrack->setGenre(txtGenre->text());
+        m_pLoadedTrack->setComposer(txtComposer->text());
         m_pLoadedTrack->setYear(txtYear->text());
         m_pLoadedTrack->setTrackNumber(txtTrackNumber->text());
         m_pLoadedTrack->setBpm(spinBpm->value());
@@ -253,6 +255,7 @@
     txtArtist->setText("");
     txtAlbum->setText("");
     txtGenre->setText("");
+    txtComposer->setText("");
     txtYear->setText("");
     txtTrackNumber->setText("");
     txtComment->setText("");

=== modified file 'mixxx/src/dlgtrackinfo.ui'
--- mixxx/src/dlgtrackinfo.ui	2011-10-05 16:29:58 +0000
+++ mixxx/src/dlgtrackinfo.ui	2011-12-28 23:47:25 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>448</width>
-    <height>571</height>
+    <height>615</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -135,7 +135,22 @@
          <item row="5" column="1" colspan="3">
           <widget class="QLineEdit" name="txtGenre"/>
          </item>
+         
          <item row="6" column="0">
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Composer:</string>
+           </property>
+           <property name="buddy" >
+            <cstring>txtComposer</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1" colspan="3">
+          <widget class="QLineEdit" name="txtComposer"/>
+         </item>
+         
+         <item row="7" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Filename:</string>
@@ -145,7 +160,7 @@
            </property>
           </widget>
          </item>
-         <item row="6" column="1" colspan="3">
+         <item row="7" column="1" colspan="3">
           <widget class="QLineEdit" name="txtFilepath">
            <property name="enabled">
             <bool>true</bool>
@@ -169,21 +184,21 @@
            </property>
           </widget>
          </item>
-         <item row="8" column="2">
+         <item row="9" column="2">
           <widget class="QLabel" name="Type">
            <property name="text">
             <string>File Type:</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="3">
+         <item row="9" column="3">
           <widget class="QLabel" name="txtType">
            <property name="text">
             <string>77</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="0">
+         <item row="10" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Comments:</string>
@@ -193,7 +208,7 @@
            </property>
           </widget>
          </item>
-         <item row="9" column="1" colspan="3">
+         <item row="10" column="1" colspan="3">
           <widget class="QTextEdit" name="txtComment">
             <property name="tabChangesFocus">
               <bool>true</bool>

=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2011-12-18 18:50:40 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2011-12-28 23:47:25 +0000
@@ -43,6 +43,8 @@
                   Qt::Horizontal, tr("Album"));
     setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
                   Qt::Horizontal, tr("Genre"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_COMPOSER),
+                  Qt::Horizontal, tr("Composer"));
     setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
                   Qt::Horizontal, tr("Year"));
     setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
@@ -528,7 +530,6 @@
     // waveform widget to load a track into a Player).
     defaultFlags |= Qt::ItemIsDragEnabled;
 
-    int row = index.row();
     int column = index.column();
 
     if ( column == fieldIndex(LIBRARYTABLE_FILETYPE)
@@ -609,6 +610,8 @@
         pTrack->setYear(value.toString());
     } else if (fieldIndex(LIBRARYTABLE_GENRE) == column) {
         pTrack->setGenre(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_COMPOSER) == column) {
+        pTrack->setComposer(value.toString());
     } else if (fieldIndex(LIBRARYTABLE_FILETYPE) == column) {
         pTrack->setType(value.toString());
     } else if (fieldIndex(LIBRARYTABLE_TRACKNUMBER) == column) {

=== modified file 'mixxx/src/library/basetrackcache.cpp'
--- mixxx/src/library/basetrackcache.cpp	2011-12-18 20:25:07 +0000
+++ mixxx/src/library/basetrackcache.cpp	2011-12-28 23:47:25 +0000
@@ -238,6 +238,8 @@
         return QVariant(pTrack->getDateAdded());
     } else if (fieldIndex(LIBRARYTABLE_GENRE) == column) {
         return QVariant(pTrack->getGenre());
+    } else if (fieldIndex(LIBRARYTABLE_COMPOSER) == column) {
+        return QVariant(pTrack->getComposer());
     } else if (fieldIndex(LIBRARYTABLE_FILETYPE) == column) {
         return QVariant(pTrack->getType());
     } else if (fieldIndex(LIBRARYTABLE_TRACKNUMBER) == column) {

=== modified file 'mixxx/src/library/browse/browsetablemodel.cpp'
--- mixxx/src/library/browse/browsetablemodel.cpp	2011-12-22 10:56:03 +0000
+++ mixxx/src/library/browse/browsetablemodel.cpp	2011-12-28 23:47:25 +0000
@@ -31,6 +31,7 @@
     header_data.insert(COLUMN_TRACK_NUMBER, tr("Track #"));
     header_data.insert(COLUMN_YEAR, tr("Year"));
     header_data.insert(COLUMN_GENRE, tr("Genre"));
+    header_data.insert(COLUMN_COMPOSER, tr("Composer"));
     header_data.insert(COLUMN_COMMENT, tr("Comment"));
     header_data.insert(COLUMN_DURATION, tr("Duration"));
     header_data.insert(COLUMN_BPM, tr("BPM"));
@@ -44,6 +45,7 @@
     addSearchColumn(COLUMN_ALBUM);
     addSearchColumn(COLUMN_TITLE);
     addSearchColumn(COLUMN_GENRE);
+    addSearchColumn(COLUMN_COMPOSER);
     addSearchColumn(COLUMN_KEY);
     addSearchColumn(COLUMN_COMMENT);
 
@@ -336,6 +338,7 @@
     tagger.setTracknumber(this->index(row,COLUMN_TRACK_NUMBER).data().toString());
     tagger.setYear(this->index(row,COLUMN_YEAR).data().toString());
     tagger.setGenre(this->index(row,COLUMN_GENRE).data().toString());
+    tagger.setComposer(this->index(row,COLUMN_COMPOSER).data().toString());
 
     //check if one the item were edited
     if(col == COLUMN_ARTIST) {
@@ -354,6 +357,8 @@
         tagger.setComment(value.toString());
     } else if(col == COLUMN_GENRE) {
         tagger.setGenre(value.toString());
+    } else if(col == COLUMN_COMPOSER) {
+        tagger.setComposer(value.toString());
     } else if(col == COLUMN_YEAR) {
         tagger.setYear(value.toString());
     }

=== modified file 'mixxx/src/library/browse/browsetablemodel.h'
--- mixxx/src/library/browse/browsetablemodel.h	2011-12-22 10:56:03 +0000
+++ mixxx/src/library/browse/browsetablemodel.h	2011-12-28 23:47:25 +0000
@@ -24,6 +24,7 @@
 const int COLUMN_TYPE = 11;
 const int COLUMN_BITRATE = 12;
 const int COLUMN_LOCATION = 13;
+const int COLUMN_COMPOSER = 14;
 
 /*
  * The BrowseTable models displays tracks

=== modified file 'mixxx/src/library/browse/browsethread.cpp'
--- mixxx/src/library/browse/browsethread.cpp	2011-11-04 20:03:24 +0000
+++ mixxx/src/library/browse/browsethread.cpp	2011-12-28 23:47:25 +0000
@@ -141,6 +141,9 @@
         item = new QStandardItem(tio.getGenre());
         row_data.insert(COLUMN_GENRE, item);
 
+        item = new QStandardItem(tio.getComposer());
+        row_data.insert(COLUMN_COMPOSER, item);
+
         item = new QStandardItem(tio.getComment());
         row_data.insert(COLUMN_COMMENT, item);
 

=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2011-12-28 23:47:25 +0000
@@ -240,13 +240,13 @@
 }
 
 void TrackDAO::prepareLibraryInsert(QSqlQuery& query) {
-    query.prepare("INSERT INTO library (artist, title, album, year, genre, tracknumber, "
-                  "filetype, location, comment, url, duration, rating, key, "
+    query.prepare("INSERT INTO library (artist, title, album, year, genre, composer, "
+				  "tracknumber, filetype, location, comment, url, duration, rating, key, "
                   "bitrate, samplerate, cuepoint, bpm, replaygain, wavesummaryhex, "
                   "timesplayed, "
                   "channels, mixxx_deleted, header_parsed, beats_version, beats) "
                   "VALUES (:artist, "
-                  ":title, :album, :year, :genre, :tracknumber, "
+                  ":title, :album, :year, :genre, :composer, :tracknumber, "
                   ":filetype, :location, :comment, :url, :duration, :rating, :key, "
                   ":bitrate, :samplerate, :cuepoint, :bpm, :replaygain, :wavesummaryhex, "
                   ":timesplayed, "
@@ -260,6 +260,7 @@
     query.bindValue(":album", pTrack->getAlbum());
     query.bindValue(":year", pTrack->getYear());
     query.bindValue(":genre", pTrack->getGenre());
+    query.bindValue(":composer", pTrack->getComposer());
     query.bindValue(":tracknumber", pTrack->getTrackNumber());
     query.bindValue(":filetype", pTrack->getType());
     query.bindValue(":location", trackLocationId);
@@ -421,7 +422,8 @@
             // but marked deleted? Skip this track.
             LOG_FAILED_QUERY(query)
                     << "Failed to INSERT new track into library:"
-                    << pTrack->getFilename();
+                    << pTrack->getFilename()
+                    << ", composer: \'" << pTrack->getComposer() << "\'";
             continue;
         }
         int trackId = query.lastInsertId().toInt();
@@ -557,6 +559,7 @@
         QString album = query.value(query.record().indexOf("album")).toString();
         QString year = query.value(query.record().indexOf("year")).toString();
         QString genre = query.value(query.record().indexOf("genre")).toString();
+        QString composer = query.value(query.record().indexOf("composer")).toString();
         QString tracknumber = query.value(query.record().indexOf("tracknumber")).toString();
         QString comment = query.value(query.record().indexOf("comment")).toString();
         QString url = query.value(query.record().indexOf("url")).toString();
@@ -591,6 +594,7 @@
         pTrack->setAlbum(album);
         pTrack->setYear(year);
         pTrack->setGenre(genre);
+        pTrack->setComposer(composer);
         pTrack->setTrackNumber(tracknumber);
         pTrack->setRating(rating);
         pTrack->setKey(key);
@@ -704,7 +708,7 @@
     QSqlQuery query(m_database);
 
     query.prepare(
-        "SELECT library.id, artist, title, album, year, genre, tracknumber, "
+        "SELECT library.id, artist, title, album, year, genre, composer, tracknumber, "
         "filetype, rating, key, track_locations.location as location, "
         "track_locations.filesize as filesize, comment, url, duration, bitrate, "
         "samplerate, cuepoint, bpm, replaygain, wavesummaryhex, channels, "
@@ -747,7 +751,7 @@
     query.prepare("UPDATE library "
                   "SET artist=:artist, "
                   "title=:title, album=:album, year=:year, genre=:genre, "
-                  "filetype=:filetype, tracknumber=:tracknumber, "
+                  "composer=:composer, filetype=:filetype, tracknumber=:tracknumber, "
                   "comment=:comment, url=:url, duration=:duration, rating=:rating, key=:key, "
                   "bitrate=:bitrate, samplerate=:samplerate, cuepoint=:cuepoint, "
                   "bpm=:bpm, replaygain=:replaygain, wavesummaryhex=:wavesummaryhex, "
@@ -760,6 +764,7 @@
     query.bindValue(":album", pTrack->getAlbum());
     query.bindValue(":year", pTrack->getYear());
     query.bindValue(":genre", pTrack->getGenre());
+    query.bindValue(":composer", pTrack->getComposer());
     query.bindValue(":filetype", pTrack->getType());
     query.bindValue(":tracknumber", pTrack->getTrackNumber());
     query.bindValue(":comment", pTrack->getComment());
@@ -984,6 +989,7 @@
         tagger.setArtist(pTrack->getArtist());
         tagger.setTitle(pTrack->getTitle());
         tagger.setGenre(pTrack->getGenre());
+        tagger.setComposer(pTrack->getComposer());
         tagger.setAlbum(pTrack->getAlbum());
         tagger.setComment(pTrack->getComment());
         tagger.setTracknumber(pTrack->getTrackNumber());

=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/trackdao.h	2011-12-28 23:47:25 +0000
@@ -25,6 +25,7 @@
 const QString LIBRARYTABLE_ALBUM = "album";
 const QString LIBRARYTABLE_YEAR = "year";
 const QString LIBRARYTABLE_GENRE = "genre";
+const QString LIBRARYTABLE_COMPOSER = "composer";
 const QString LIBRARYTABLE_TRACKNUMBER = "tracknumber";
 const QString LIBRARYTABLE_FILETYPE = "filetype";
 const QString LIBRARYTABLE_LOCATION = "location";

=== modified file 'mixxx/src/library/mixxxlibraryfeature.cpp'
--- mixxx/src/library/mixxxlibraryfeature.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/library/mixxxlibraryfeature.cpp	2011-12-28 23:47:25 +0000
@@ -28,6 +28,7 @@
             << "library." + LIBRARYTABLE_DURATION
             << "library." + LIBRARYTABLE_RATING
             << "library." + LIBRARYTABLE_GENRE
+            << "library." + LIBRARYTABLE_COMPOSER
             << "library." + LIBRARYTABLE_FILETYPE
             << "library." + LIBRARYTABLE_TRACKNUMBER
             << "library." + LIBRARYTABLE_KEY

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2011-10-21 02:09:53 +0000
+++ mixxx/src/library/trackcollection.cpp	2011-12-28 23:47:25 +0000
@@ -67,7 +67,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 13;
+    int requiredSchemaVersion = 14;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, tr("Cannot upgrade database schema"),

=== modified file 'mixxx/src/soundsource.cpp'
--- mixxx/src/soundsource.cpp	2011-03-22 16:24:04 +0000
+++ mixxx/src/soundsource.cpp	2011-12-28 23:47:25 +0000
@@ -110,6 +110,10 @@
 {
     return m_sGenre;
 }
+QString SoundSource::getComposer()
+{
+    return m_sComposer;
+}
 QString SoundSource::getTrackNumber()
 {
     return m_sTrackNumber;
@@ -167,6 +171,10 @@
 {
     m_sGenre = genre;
 }
+void SoundSource::setComposer(QString composer)
+{
+    m_sComposer = composer;
+}
 void SoundSource::setTrackNumber(QString trackNumber)
 {
     m_sTrackNumber = trackNumber;
@@ -326,6 +334,12 @@
             }
         }
     }
+    TagLib::ID3v2::FrameList composerFrame = id3v2->frameListMap()["TCOM"];
+    if (!composerFrame.isEmpty()) {
+        QString sComposer = TStringToQString(composerFrame.front()->toString());
+        setComposer(sComposer);
+    }
+
     return true;
 }
 

=== modified file 'mixxx/src/soundsource.h'
--- mixxx/src/soundsource.h	2011-11-02 01:09:26 +0000
+++ mixxx/src/soundsource.h	2011-12-28 23:47:25 +0000
@@ -75,6 +75,7 @@
     virtual QString getComment();
     virtual QString getYear();
     virtual QString getGenre();
+    virtual QString getComposer();
     virtual QString getTrackNumber();
     virtual float getReplayGain();
     virtual QString getKey();
@@ -91,6 +92,7 @@
     virtual void setComment(QString);
     virtual void setYear(QString);
     virtual void setGenre(QString);
+    virtual void setComposer(QString);
     virtual void setTrackNumber(QString);
     virtual void setReplayGain(float);
     virtual void setKey(QString);
@@ -122,6 +124,7 @@
     QString m_sComment;
     QString m_sYear;
     QString m_sGenre;
+    QString m_sComposer;
     QString m_sTrackNumber;
     float m_fReplayGain;
     QString m_sKey;

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2011-12-15 21:15:41 +0000
+++ mixxx/src/soundsourceproxy.cpp	2011-12-28 23:47:25 +0000
@@ -302,7 +302,8 @@
         p->setType(sndsrc->getType());
         p->setYear(sndsrc->getYear());
         p->setGenre(sndsrc->getGenre());
-	p->setComment(sndsrc->getComment());
+        p->setComposer(sndsrc->getComposer());
+        p->setComment(sndsrc->getComment());
         p->setTrackNumber(sndsrc->getTrackNumber());
         p->setReplayGain(sndsrc->getReplayGain());
         p->setBpm(sndsrc->getBPM());

=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/trackinfoobject.cpp	2011-12-28 23:47:25 +0000
@@ -508,6 +508,22 @@
         setDirty(true);
 }
 
+QString TrackInfoObject::getComposer()  const
+{
+    QMutexLocker lock(&m_qMutex);
+    return m_sComposer;
+}
+
+void TrackInfoObject::setComposer(QString s)
+{
+    QMutexLocker lock(&m_qMutex);
+    s = s.trimmed();
+    bool dirty = m_sComposer != s;
+    m_sComposer = s;
+    if (dirty)
+        setDirty(true);
+}
+
 QString TrackInfoObject::getTrackNumber()  const
 {
     QMutexLocker lock(&m_qMutex);

=== modified file 'mixxx/src/trackinfoobject.h'
--- mixxx/src/trackinfoobject.h	2011-10-03 22:37:35 +0000
+++ mixxx/src/trackinfoobject.h	2011-12-28 23:47:25 +0000
@@ -77,6 +77,7 @@
     Q_PROPERTY(QString title READ getTitle WRITE setTitle)
     Q_PROPERTY(QString album READ getAlbum WRITE setAlbum)
     Q_PROPERTY(QString genre READ getGenre WRITE setGenre)
+    Q_PROPERTY(QString composer READ getComposer WRITE setComposer)
     Q_PROPERTY(QString year READ getYear WRITE setYear)
     Q_PROPERTY(QString track_number READ getTrackNumber WRITE setTrackNumber)
     Q_PROPERTY(int times_played READ getTimesPlayed)
@@ -172,6 +173,10 @@
     QString getGenre() const;
     /** Set genre */
     void setGenre(QString);
+    /** Return composer */
+	QString getComposer() const;
+	/** Set composer */
+	void setComposer(QString);
     /** Return Track Number */
     QString getTrackNumber() const;
     /** Set Track Number */
@@ -317,6 +322,8 @@
     QString m_sTitle;
     /** Genre */
     QString m_sGenre;
+    /** Composer */
+    QString m_sComposer;
     /** Year */
     QString m_sYear;
     /** Track Number */