Merge lp:~mixxxcontributors/mixxx/features_autodj into lp:~mixxxdevelopers/mixxx/trunk

[RJ Skerry-Ryan]

This branch brings Daniel Schürmann improvements to AutoDJ into Mixxx. I have reviewed the branch and it looks good to me from a stability and product/feature point of view.

[RJ Skerry-Ryan (rryan)]

review: Approve

=== added directory 'mixxx/res/images/autodj'
=== added file 'mixxx/res/images/autodj/bottom.svg'
--- mixxx/res/images/autodj/bottom.svg	1970-01-01 00:00:00 +0000
+++ mixxx/res/images/autodj/bottom.svg	2012-03-12 04:06:20 +0000
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg4289"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/lapo/Icone/cvs/gnome-icon-theme/scalable/categories"
+   sodipodi:docname="bottom.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4291">
+    <linearGradient
+       id="linearGradient3155"
+       inkscape:collect="always">
+      <stop
+         id="stop3157"
+         offset="0"
+         style="stop-color:#ffb584;stop-opacity:1;" />
+      <stop
+         id="stop3159"
+         offset="1"
+         style="stop-color:#ffb584;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155"
+       id="linearGradient3273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1532521,0,0,0.1530054,-25.916429,-53.611392)"
+       x1="325.71429"
+       y1="369.50507"
+       x2="325.71429"
+       y2="546.64789" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666"
+     borderopacity="0.31372549"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.656854"
+     inkscape:cx="25.963489"
+     inkscape:cy="20.551712"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1019"
+     inkscape:window-height="732"
+     inkscape:window-x="259"
+     inkscape:window-y="19"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4294">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>System Preferences</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>category</rdf:li>
+            <rdf:li>system</rdf:li>
+            <rdf:li>preferences</rdf:li>
+            <rdf:li>settings</rdf:li>
+            <rdf:li>control center</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2453"
+       inkscape:label="Calque 1"
+       transform="matrix(0.1337942,0,0,0.1337942,-18.472238,-41.04701)" />
+    <path
+       style="fill:#ea5d00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9139747;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.7500156,19.774362 L 24.043348,39.555555 L 41.25,19.774362 L 33.004787,19.774362 L 33.004787,4.0000015 L 15.136157,4.0000015 L 15.136157,19.774362 L 6.7500156,19.774362 z"
+       id="path4348"
+       sodipodi:nodetypes="cccccccc" />
+    <rect
+       y="39.555557"
+       x="6.75"
+       height="4.4444442"
+       width="34.499985"
+       id="rect4242"
+       style="fill:#ea5d00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.84845495;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="fill:url(#linearGradient3273);fill-opacity:1"
+       d="M 15.131549,4.0000015 L 15.131549,19.76389 L 6.75,19.76389 L 15.027214,29.208333 C 17.837762,29.718667 20.845017,30.041667 23.999992,30.041667 C 27.180083,30.041667 30.212896,29.726456 33.042326,29.208333 L 41.249983,19.76389 L 33.007548,19.76389 L 33.007548,4.0000015 L 15.131549,4.0000015 z"
+       id="path3261" />
+  </g>
+</svg>

=== added file 'mixxx/res/images/autodj/media-playlist-shuffle.svg'
--- mixxx/res/images/autodj/media-playlist-shuffle.svg	1970-01-01 00:00:00 +0000
+++ mixxx/res/images/autodj/media-playlist-shuffle.svg	2012-03-12 04:06:20 +0000
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg7854"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="media-playlist-shuffle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/lapo/Icone/gnome-icon-theme/32x32/status/media-playlist-repeat.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7856">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="21.132059"
+       x2="22.892584"
+       y1="0.90414524"
+       x1="22.892584"
+       id="linearGradient3178"
+       xlink:href="#linearGradient3172"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3172">
+      <stop
+         id="stop3174"
+         offset="0"
+         style="stop-color:#ffb584;stop-opacity:1;" />
+      <stop
+         id="stop3176"
+         offset="1"
+         style="stop-color:#ffb584;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3172"
+       id="linearGradient3747"
+       gradientUnits="userSpaceOnUse"
+       x1="22.892584"
+       y1="0.90414524"
+       x2="22.892584"
+       y2="21.132059" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3172"
+       id="linearGradient3752"
+       gradientUnits="userSpaceOnUse"
+       x1="22.892584"
+       y1="0.90414524"
+       x2="22.892584"
+       y2="21.132059"
+       gradientTransform="matrix(0.644962,0,0,-1.1832362,59.235153,43.983663)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3172"
+       id="linearGradient3755"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.644962,0,0,1.1832362,9.235153,4.016337)"
+       x1="22.892584"
+       y1="0.90414524"
+       x2="22.892584"
+       y2="21.132059" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#afafaf"
+     borderopacity="1"
+     gridtolerance="15.1"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="20.022534"
+     inkscape:cy="20.71947"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="48px"
+     height="48px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="872"
+     inkscape:window-height="723"
+     inkscape:window-x="406"
+     inkscape:window-y="21"
+     showgrid="false"
+     inkscape:grid-points="false"
+     showborder="true"
+     showguides="false"
+     inkscape:guide-bbox="false"
+     inkscape:grid-bbox="true"
+     inkscape:object-paths="false"
+     inkscape:window-maximized="0">
+    <sodipodi:guide
+       orientation="horizontal"
+       position="8.6620581"
+       id="guide7377" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="6"
+       id="guide7379" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="36.062446"
+       id="guide7492" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="51"
+       id="guide7046" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-17.5"
+       id="guide7233" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-29"
+       id="guide7235" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="44.547727"
+       id="guide6795" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="16.970563"
+       id="guide6797" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="23.511301"
+       id="guide6914" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7859">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title></dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#ea5d00;fill:#ea5d00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+       d="m 31.458167,11 0,0.971084 0,2.506024 -2.5498,0 c -2.309243,1e-6 -4.600856,0.959829 -6.438247,2.568675 -1.848702,1.618749 -3.250996,4.052721 -3.250996,6.954217 0,1.569915 -0.481869,2.684008 -1.211156,3.414458 -0.729287,0.73045 -1.72852,1.096385 -2.868526,1.096385 l -4.589641,0 -2.0398408,0 -0.5099602,0 0,0.501205 0,4.009639 0,0.501205 0.5099602,0 2.0398408,0 4.589641,0 c 4.913523,0 9.179283,-4.047685 9.179283,-9.522892 0,-1.311125 0.627138,-2.380239 1.593626,-3.226506 0.947549,-0.829685 2.290606,-1.284337 2.996016,-1.284337 l 2.5498,0 0,2.506024 0,0.971084 L 32.25498,22.40241 39.394422,17.390361 40,16.983133 39.394422,16.575904 32.25498,11.563855 31.458167,11 z M 8,14.477108 l 0,0.501205 0,4.009639 0,0.501205 0.5099602,0 2.0398408,0 4.589641,0 c 1.140006,0 2.139239,0.365935 2.868526,1.096385 0.383279,0.38389 0.711734,0.865992 0.924303,1.472289 0.409442,-1.928125 1.388391,-3.582339 2.645418,-4.855421 -0.0054,-0.0055 0.0055,-0.0258 0,-0.03133 -1.680631,-1.696317 -3.981485,-2.693972 -6.438247,-2.693972 l -4.589641,0 -2.0398408,0 -0.5099602,0 z m 23.458167,10.556627 0,0.971084 0,2.506024 -2.5498,0 c -0.70541,0 -2.048467,-0.454652 -2.996016,-1.284337 -0.528622,-0.462867 -0.932659,-0.998256 -1.211156,-1.59759 -0.308884,1.992948 -1.187966,3.74975 -2.422311,5.137349 0.06485,0.05987 0.125211,0.13014 0.191236,0.187952 1.837391,1.608846 4.129004,2.568674 6.438247,2.568675 l 2.5498,0 0,2.506024 0,0.971084 0.796813,-0.563855 7.139442,-5.012049 L 40,31.016867 39.394422,30.609639 32.25498,25.59759 31.458167,25.033735 z"
+       id="path6784" />
+    <path
+       style="fill:url(#linearGradient3755);fill-opacity:1;stroke:none"
+       d="m 24,29.65625 c -0.297307,0 -0.5803,-0.02559 -0.875,-0.03125 0.774683,-1.167911 1.33229,-2.514662 1.5625,-4 0.278497,0.599334 0.690128,1.130883 1.21875,1.59375 0.947549,0.829685 2.29459,1.28125 3,1.28125 l 2.5625,0 0,-2.5 0,-0.96875 0.78125,0.5625 3.46875,2.4375 C 32.250392,29.058149 28.258286,29.65625 24,29.65625 z M 22.5625,29.625 C 19.537058,29.52951 16.652999,29.1332 14.03125,28.5 l 1.09375,0 c 1.140006,0 2.145713,-0.3633 2.875,-1.09375 0.729287,-0.73045 1.21875,-1.836335 1.21875,-3.40625 0,-2.901496 1.401298,-5.350001 3.25,-6.96875 1.837391,-1.608846 4.128257,-2.562499 6.4375,-2.5625 l 2.5625,0 0,-2.5 0,-0.96875 0.78125,0.5625 7.15625,5 L 40,16.96875 39.40625,17.375 32.25,22.40625 l -0.78125,0.5625 0,-0.96875 0,-2.5 -2.5625,0 c -0.70541,0 -2.052451,0.451565 -3,1.28125 C 24.939762,21.627517 24.3125,22.688875 24.3125,24 c 0,2.153291 -0.650512,4.072677 -1.75,5.625 z m -3.625,-7.5625 C 18.724931,21.456203 18.383279,20.97764 18,20.59375 17.270713,19.8633 16.265006,19.5 15.125,19.5 l -4.5625,0 -2.0625,0 -0.5,0 0,-0.5 0,-4.03125 0,-0.5 0.5,0 2.0625,0 4.5625,0 c 2.456762,0 4.756869,0.991183 6.4375,2.6875 0.0055,0.0055 -0.0054,0.02575 0,0.03125 -1.257027,1.273082 -2.215558,2.946875 -2.625,4.875 z"
+       id="path3741" />
+    <g
+       transform="matrix(0.1337942,0,0,-0.1337942,31.527762,89.04701)"
+       inkscape:label="Calque 1"
+       id="g3743" />
+    <g
+       transform="matrix(0.1672428,0,0,-0.1672428,38.442916,104.62323)"
+       inkscape:label="Calque 1"
+       id="g3745" />
+  </g>
+</svg>

=== added file 'mixxx/res/images/autodj/stock_mail-send-receive.svg'
--- mixxx/res/images/autodj/stock_mail-send-receive.svg	1970-01-01 00:00:00 +0000
+++ mixxx/res/images/autodj/stock_mail-send-receive.svg	2012-03-12 04:06:20 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg3787"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="Nouveau document 4">
+  <defs
+     id="defs3789">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3172"
+       id="linearGradient3767"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.644962,0,0,1.1832362,9.235153,4.016337)"
+       x1="22.892584"
+       y1="0.90414524"
+       x2="22.892584"
+       y2="21.132059" />
+    <linearGradient
+       id="linearGradient3172">
+      <stop
+         id="stop3174"
+         offset="0"
+         style="stop-color:#ffb584;stop-opacity:1;" />
+      <stop
+         id="stop3176"
+         offset="1"
+         style="stop-color:#ffb584;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="596"
+     inkscape:window-height="502"
+     inkscape:window-x="768"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3792">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#ea5d00;fill:#ea5d00;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+       d="m 14.59375,4 -0.375,0.375 -9.46875,9.15625 -0.75,0.75 1.125,0 4.3125,0 0,18.03125 0,0.46875 0.53125,-0.03125 9.3125,-0.03125 0.5,0 0,-0.4375 0,-18 4.375,0 1.15625,0 -0.75,-0.75 L 14.96875,4.375 14.59375,4 z m 13.46875,11.21875 0,0.4375 0,18.0625 -4.25,0 -1.15625,0 0.75,0.75 L 32.875,43.625 33.25,44 l 0.40625,-0.375 9.5625,-9.15625 0.78125,-0.75 -1.15625,0 -4.40625,0 0,-18 0,-0.4375 -0.53125,0 -9.3125,-0.0625 -0.53125,0 z"
+       id="path4360" />
+    <path
+       style="fill:url(#linearGradient3767);fill-opacity:1;stroke:none"
+       d="M 19.78125,29.4375 C 15.932317,29.076763 12.418889,28.236656 9.4375,27.03125 l 0,-12.75 -4.3125,0 -1.125,0 0.75,-0.75 9.46875,-9.15625 0.375,-0.375 0.375,0.375 9.59375,9.15625 0.75,0.75 -1.15625,0 -4.375,0 0,15.15625 z m 8.28125,0 0,-13.78125 0,-0.4375 0.53125,0 9.3125,0.0625 0.53125,0 0,0.4375 0,11.34375 c -2.995811,1.195807 -6.517914,2.027067 -10.375,2.375 z"
+       id="path3753" />
+  </g>
+</svg>

=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2011-12-22 18:43:09 +0000
+++ mixxx/res/mixxx.qrc	2012-03-12 04:06:20 +0000
@@ -1,5 +1,8 @@
 <RCC>
     <qresource prefix="/">
+        <file>images/autodj/media-playlist-shuffle.svg</file>
+        <file>images/autodj/stock_mail-send-receive.svg</file>
+        <file>images/autodj/bottom.svg</file>
         <file>html/crates.html</file>
         <file>html/playlists.html</file>
         <file>images/mixxx-icon.png</file>

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2011-11-30 06:19:47 +0000
+++ mixxx/src/dlgautodj.cpp	2012-03-12 04:06:20 +0000
@@ -1,28 +1,38 @@
 #include <QSqlTableModel>
-#include "widget/wwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wtracktableview.h"
+
+#include "dlgautodj.h"
+
 #include "controlobject.h"
 #include "controlobjectthreadmain.h"
+#include "library/playlisttablemodel.h"
 #include "library/trackcollection.h"
-#include "library/playlisttablemodel.h"
-#include "dlgautodj.h"
+#include "playerinfo.h"
+#include "widget/wskincolor.h"
+#include "widget/wtracktableview.h"
+#include "widget/wwidget.h"
 
+#define CONFIG_KEY "[Auto DJ]"
+const char* kTransitionPreferenceName = "Transition";
+const int kTransitionPreferenceDefault = 10;
 
 DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
-                     TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard)
-     : QWidget(parent), Ui::DlgAutoDJ(), m_playlistDao(pTrackCollection->getPlaylistDAO())
-{
+                     TrackCollection* pTrackCollection,
+                     MixxxKeyboard* pKeyboard)
+        : QWidget(parent),
+          Ui::DlgAutoDJ(),
+          m_pConfig(pConfig),
+          m_pTrackCollection(pTrackCollection),
+          m_pTrackTableView(
+              new WTrackTableView(this, pConfig, m_pTrackCollection)),
+          m_playlistDao(pTrackCollection->getPlaylistDAO()),
+          m_bAutoDJEnabled(false),
+          m_bFadeNow(false),
+          m_eState(ADJ_IDLE),
+          m_posThreshold1(1.0f),
+          m_posThreshold2(1.0f) {
     setupUi(this);
 
-    m_pConfig = pConfig;
-    m_pTrackCollection = pTrackCollection;
-    m_bAutoDJEnabled = false;
-    m_bPlayer1Primed = false;
-    m_bPlayer2Primed = false;
-    m_pTrackTableView = new WTrackTableView(this, pConfig, m_pTrackCollection);
     m_pTrackTableView->installEventFilter(pKeyboard);
-
     connect(m_pTrackTableView, SIGNAL(loadTrack(TrackPointer)),
             this, SIGNAL(loadTrack(TrackPointer)));
     connect(m_pTrackTableView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
@@ -34,8 +44,8 @@
     m_pTrackTablePlaceholder->hide();
     box->insertWidget(1, m_pTrackTableView);
 
-    m_pAutoDJTableModel =  new PlaylistTableModel(this, pTrackCollection,
-                                                  "mixxx.db.model.autodj");
+    m_pAutoDJTableModel = new PlaylistTableModel(this, pTrackCollection,
+                                                 "mixxx.db.model.autodj");
     int playlistId = m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
     if (playlistId < 0) {
         m_playlistDao.createPlaylist(AUTODJ_TABLE, true);
@@ -44,7 +54,7 @@
     m_pAutoDJTableModel->setPlaylist(playlistId);
     m_pTrackTableView->loadTrackModel(m_pAutoDJTableModel);
 
-    //Override some playlist-view properties:
+    // Override some playlist-view properties:
 
     // Do not set this because it disables auto-scrolling
     //m_pTrackTableView->setDragDropMode(QAbstractItemView::InternalMove);
@@ -55,43 +65,65 @@
     connect(pushButtonShuffle, SIGNAL(clicked(bool)),
             this, SLOT(shufflePlaylist(bool)));
 
+    connect(pushButtonSkipNext, SIGNAL(clicked(bool)),
+            this, SLOT(skipNext(bool)));
+
+    connect(pushButtonFadeNow, SIGNAL(clicked(bool)),
+            this, SLOT(fadeNow(bool)));
+
+    connect(spinBoxTransition, SIGNAL(valueChanged(int)),
+            this, SLOT(transitionValueChanged(int)));
+
     connect(pushButtonAutoDJ, SIGNAL(toggled(bool)),
             this,  SLOT(toggleAutoDJ(bool))); _blah;
 
+    // playposition is from -0.14 to + 1.14
     m_pCOPlayPos1 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel1]", "playposition")));
+        ControlObject::getControl(ConfigKey("[Channel1]", "playposition")));
     m_pCOPlayPos2 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel2]", "playposition")));
+        ControlObject::getControl(ConfigKey("[Channel2]", "playposition")));
     m_pCOPlay1 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel1]", "play")));
+        ControlObject::getControl(ConfigKey("[Channel1]", "play")));
     m_pCOPlay2 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel2]", "play")));
+        ControlObject::getControl(ConfigKey("[Channel2]", "play")));
+    m_pCOPlay1Fb = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey("[Channel1]", "play")));
+    m_pCOPlay2Fb = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey("[Channel2]", "play")));
     m_pCORepeat1 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel1]", "repeat")));
+        ControlObject::getControl(ConfigKey("[Channel1]", "repeat")));
     m_pCORepeat2 = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Channel2]", "repeat")));
+        ControlObject::getControl(ConfigKey("[Channel2]", "repeat")));
     m_pCOCrossfader = new ControlObjectThreadMain(
-                            ControlObject::getControl(ConfigKey("[Master]", "crossfader")));
+        ControlObject::getControl(ConfigKey("[Master]", "crossfader")));
+
+    QString str_autoDjTransition = m_pConfig->getValueString(
+        ConfigKey(CONFIG_KEY, kTransitionPreferenceName));
+    if (str_autoDjTransition.isEmpty()) {
+        spinBoxTransition->setValue(kTransitionPreferenceDefault);
+    } else {
+        spinBoxTransition->setValue(str_autoDjTransition.toInt());
+    }
 }
 
-DlgAutoDJ::~DlgAutoDJ()
-{
+DlgAutoDJ::~DlgAutoDJ() {
     delete m_pCOPlayPos1;
     delete m_pCOPlayPos2;
     delete m_pCOPlay1;
     delete m_pCOPlay2;
+    delete m_pCOPlay1Fb;
+    delete m_pCOPlay2Fb;
+    delete m_pCORepeat1;
     delete m_pCORepeat2;
     delete m_pCOCrossfader;
+    delete m_pAutoDJTableModel;
 }
 
-void DlgAutoDJ::onShow()
-{
+void DlgAutoDJ::onShow() {
     m_pAutoDJTableModel->select();
 }
 
-void DlgAutoDJ::setup(QDomNode node)
-{
-
+void DlgAutoDJ::setup(QDomNode node) {
     QPalette pal = palette();
 
     // Row colors
@@ -108,9 +140,6 @@
         // the future this should be configurable from the skin with this as the
         // fallback option
         QColor text(255 - r1.red(), 255 - r1.green(), 255 - r1.blue());
-
-        //setAlternatingRowColors ( true );
-
         QColor fgColor;
         fgColor.setNamedColor(WWidget::selectNodeQString(node, "FgColor"));
         fgColor = WSkinColor::getCorrectColor(fgColor);
@@ -119,26 +148,24 @@
         pal.setColor(QPalette::AlternateBase, r2);
         pal.setColor(QPalette::Text, text);
         pal.setColor(QPalette::WindowText, fgColor);
-
     }
 
     setPalette(pal);
 
     pushButtonAutoDJ->setPalette(pal);
-    //m_pTrackTableView->setPalette(pal); //Since we're getting this passed into us already created,
-                                          //shouldn't need to set the palette.
-}
-
-void DlgAutoDJ::onSearchStarting()
-{
-}
-
-void DlgAutoDJ::onSearchCleared()
-{
-}
-
-void DlgAutoDJ::onSearch(const QString& text)
-{
+
+    // Since we're getting this passed into us already created, shouldn't need
+    // to set the palette.
+    //m_pTrackTableView->setPalette(pal);
+}
+
+void DlgAutoDJ::onSearchStarting() {
+}
+
+void DlgAutoDJ::onSearchCleared() {
+}
+
+void DlgAutoDJ::onSearch(const QString& text) {
     m_pAutoDJTableModel->search(text);
 }
 
@@ -154,204 +181,439 @@
     m_pTrackTableView->moveSelection(delta);
 }
 
-void DlgAutoDJ::shufflePlaylist(bool buttonChecked)
-{
+void DlgAutoDJ::shufflePlaylist(bool buttonChecked) {
     Q_UNUSED(buttonChecked);
     qDebug() << "Shuffling AutoDJ playlist";
     m_pAutoDJTableModel->shuffleTracks(m_pAutoDJTableModel->index(0, 0));
     qDebug() << "Shuffling done";
 }
 
-void DlgAutoDJ::toggleAutoDJ(bool toggle)
-{
-    if (toggle) //Enable Auto DJ
-    {
-        if (m_pCOPlay1->get() == 1.0f && m_pCOPlay2->get() == 1.0f) {
+void DlgAutoDJ::skipNext(bool buttonChecked) {
+    Q_UNUSED(buttonChecked);
+    qDebug() << "Skip Next";
+    // Load the next song from the queue.
+    if (m_pCOPlay1Fb->get() == 0.0f) {
+        removePlayingTrackFromQueue("[Channel1]");
+        loadNextTrackFromQueue();
+    } else if (m_pCOPlay2Fb->get() == 0.0f) {
+        removePlayingTrackFromQueue("[Channel2]");
+        loadNextTrackFromQueue();
+    }
+}
+
+void DlgAutoDJ::fadeNow(bool buttonChecked) {
+    Q_UNUSED(buttonChecked);
+    qDebug() << "Fade Now";
+    if (m_eState == ADJ_IDLE && m_bAutoDJEnabled) {
+        m_bFadeNow = true;
+        double crossfader = m_pCOCrossfader->get();
+        if (crossfader <= 0.3f && m_pCOPlay1Fb->get() == 1.0f) {
+            m_posThreshold1 = m_pCOPlayPos1->get() -
+                    ((crossfader + 1.0f) / 2 * (m_fadeDuration1));
+            // Repeat is disabled by FadeNow but disables auto Fade
+            m_pCORepeat1->slotSet(0.0f);
+        } else if (crossfader >= -0.3f && m_pCOPlay2Fb->get() == 1.0f) {
+            m_posThreshold2 = m_pCOPlayPos2->get() -
+                    ((1.0f - crossfader) / 2 * (m_fadeDuration2));
+            // Repeat is disabled by FadeNow but disables auto Fade
+            m_pCORepeat2->slotSet(0.0f);
+        }
+    }
+}
+
+void DlgAutoDJ::toggleAutoDJ(bool toggle) {
+    bool deck1Playing = m_pCOPlay1Fb->get() == 1.0f;
+    bool deck2Playing = m_pCOPlay2Fb->get() == 1.0f;
+
+    if (toggle) {  // Enable Auto DJ
+        if (deck1Playing && deck2Playing) {
+            QMessageBox::warning(
+                NULL, tr("Auto-DJ"),
+                tr("One player must be stopped to enable Auto-DJ mode."),
+                QMessageBox::Ok);
             qDebug() << "One player must be stopped before enabling Auto DJ mode";
             pushButtonAutoDJ->setChecked(false);
             return;
         }
 
+        // Never load the same track if it is already playing
+        if (deck1Playing) {
+            removePlayingTrackFromQueue("[Channel1]");
+        }
+        if (deck2Playing) {
+            removePlayingTrackFromQueue("[Channel2]");
+        }
+
+        TrackPointer nextTrack = getNextTrackFromQueue();
+        if (!nextTrack) {
+            qDebug() << "Queue is empty now";
+            pushButtonAutoDJ->setChecked(false);
+            return;
+        }
+
+        // Track is available so GO
+        pushButtonAutoDJ->setToolTip(tr("Disable Auto DJ"));
         pushButtonAutoDJ->setText(tr("Disable Auto DJ"));
+        qDebug() << "Auto DJ enabled";
         m_bAutoDJEnabled = true;
+
         connect(m_pCOPlayPos1, SIGNAL(valueChanged(double)),
-        this, SLOT(player1PositionChanged(double)));
+                this, SLOT(player1PositionChanged(double)));
         connect(m_pCOPlayPos2, SIGNAL(valueChanged(double)),
-        this, SLOT(player2PositionChanged(double)));
-
-
-        //Manually override the "next track is already loaded" flag
-        //because we've already primed a player with the first track.
-        //We do this so that you don't lose the first song in your
-        //Auto DJ queue if you enable Auto DJ then change your mind
-        //and disable it right away. This just makes it a little bit
-        //more user friendly. :)
-        //m_bNextTrackAlreadyLoaded = true;
-        m_bPlayer1Primed = false;
-        m_bPlayer2Primed = false;
-
-        //If there are no tracks in the Auto DJ queue, disable Auto DJ mode.
-       /* if (m_pAutoDJTableModel->rowCount() == 0)
-        {
-            //Queue was empty. Disable and return.
-            pushButtonAutoDJ->setChecked(false);
-            return;
-        }*/ //don't need this code, above block takes care of this case.
-
-        //If only one of the players is playing...
-        if ((m_pCOPlay1->get() == 1.0f && m_pCOPlay2->get() == 0.0f) ||
-            (m_pCOPlay1->get() == 0.0f && m_pCOPlay2->get() == 1.0f))
-        {
-            //Load the first song from the queue.
-            if (!loadNextTrackFromQueue(false)) {
-                //Queue was empty. Disable and return.
-                pushButtonAutoDJ->setChecked(false);
-                return;
-            }
-            //Set the primed flags so the crossfading algorithm knows
-            //that it doesn't need to load a track into whatever player.
-            if (m_pCOPlay1->get() == 1.0f)
-            {
-                m_bPlayer1Primed = true;
-            }
-            if (m_pCOPlay2->get() == 1.0f)
-            {
-                m_bPlayer2Primed = true;
-            }
-        }
-        //If both players are stopped, start the first one (which should have just had a track loaded into it)
-        else if (m_pCOPlay1->get() == 0.0f && m_pCOPlay2->get() == 0.0f) {
-            //Load the first song from the queue.
-            if (!loadNextTrackFromQueue(false)) {
-                //Queue was empty. Disable and return.
-                pushButtonAutoDJ->setChecked(false);
-                return;
-            }
-            m_pCOCrossfader->slotSet(-1.0f); //Move crossfader to the left!
-            m_pCORepeat1->slotSet(1.0f); //Turn on repeat mode to avoid race condition between async load
-                                               //and "play" command.
-            m_pCOPlay1->slotSet(1.0f); //Play the track in player 1
-        }
-    }
-    else //Disable Auto DJ
-    {
+                this, SLOT(player2PositionChanged(double)));
+
+        connect(m_pCOPlay1Fb, SIGNAL(valueChanged(double)),
+                this, SLOT(player1PlayChanged(double)));
+        connect(m_pCOPlay2Fb, SIGNAL(valueChanged(double)),
+                this, SLOT(player2PlayChanged(double)));
+
+        if (!deck1Playing && !deck2Playing) {
+            // both decks are stopped
+            m_eState = ADJ_ENABLE_P1LOADED;
+            // Force Update on load Track
+            m_pCOPlayPos1->slotSet(-0.001f);
+        } else if (deck1Playing) {
+            // deck 1 is already playing
+            m_eState = ADJ_IDLE;
+            player1PlayChanged(1.0f);
+        } else {
+            // deck 2 is already playing
+            m_eState = ADJ_IDLE;
+            player2PlayChanged(1.0f);
+        }
+        // Loads into first deck If stopped else into second else not
+        emit(loadTrack(nextTrack));
+    } else {  // Disable Auto DJ
+        pushButtonAutoDJ->setToolTip(tr("Enable Auto DJ"));
         pushButtonAutoDJ->setText(tr("Enable Auto DJ"));
         qDebug() << "Auto DJ disabled";
         m_bAutoDJEnabled = false;
+        m_bFadeNow = false;
         m_pCOPlayPos1->disconnect(this);
         m_pCOPlayPos2->disconnect(this);
-        m_pCORepeat1->slotSet(0.0f); //Turn off repeat mode
-        m_pCORepeat2->slotSet(0.0f); //Turn off repeat mode
-    }
-}
-
-void DlgAutoDJ::player1PositionChanged(double value)
-{
-    const float posThreshold = 0.95; //95% playback is when we crossfade and do stuff
-    if (value > posThreshold)
-    {
-        //Crossfade!
-        float crossfadeValue = -1.0f + 2*(value-posThreshold)/(1.0f-posThreshold);
-        m_pCOCrossfader->slotSet(crossfadeValue); //Move crossfader to the right!
-        //If the second player doesn't have a new track loaded in it...
-        if (!m_bPlayer2Primed)
-        {
-            qDebug() << "pp1c loading";
-
-            //Load the next track into Player 2
-            //if (!m_bNextTrackAlreadyLoaded) //Fudge to make us not skip the first track
-            {
-                if (!loadNextTrackFromQueue(true))
-                    return;
-            }
-            //m_bNextTrackAlreadyLoaded = false; //Reset fudge
-            m_bPlayer2Primed = true;
-        }
-        //If the second player is stopped...
-        if (m_pCOPlay2->get() == 0.0f)
-        {
-            //Turn off repeat mode to tell Player 1 to stop at the end
-            m_pCORepeat1->slotSet(0.0f);
-
-            //Turn on repeat mode to tell Player 2 to start playing when the new track is loaded.
-            //This helps us get around the fact that it takes time for the track to be loaded
-            //and that is executed asynchronously (so we get around the race condition).
-            m_pCORepeat2->slotSet(1.0f);
-            //Play!
-            m_pCOPlay2->slotSet(1.0f);
-        }
-
-        if (value == 1.0f)
-        {
-            m_pCOPlay1->slotSet(0.0f); //Stop the player
-            m_bPlayer1Primed = false;
-        }
-    }
-}
-
-void DlgAutoDJ::player2PositionChanged(double value)
-{
-    const float posThreshold = 0.95; //95% playback is when we crossfade and do stuff
-    if (value > posThreshold)
-    {
-        //Crossfade!
-        float crossfadeValue = 1.0f - 2*(value-posThreshold)/(1.0f-posThreshold);
-        m_pCOCrossfader->slotSet(crossfadeValue); //Move crossfader to the right!
-
-        //If the first player doesn't have the next track loaded, load a track into
-        //it and start playing it!
-        if (!m_bPlayer1Primed)
-        {
-            //Load the next track into player 1
-            //if (!m_bNextTrackAlreadyLoaded) //Fudge to make us not skip the first track
-            {
-                if (!loadNextTrackFromQueue(true))
-                    return;
-            }
-            //m_bNextTrackAlreadyLoaded = false; //Reset fudge
-            m_bPlayer1Primed = true;
-        }
-        if (m_pCOPlay1->get() == 0.0f)
-        {
-            //Turn off repeat mode to tell Player 2 to stop at the end
-            m_pCORepeat2->slotSet(0.0f);
-
-            //Turn on repeat mode to tell Player 1 to start playing when the new track is loaded.
-            //This helps us get around the fact that it takes time for the track to be loaded
-            //and that is executed asynchronously (so we get around the race condition).
-            m_pCORepeat1->slotSet(1.0f);
-            m_pCOPlay1->slotSet(1.0f);
-        }
-
-        if (value == 1.0f)
-        {
-            m_pCOPlay2->slotSet(0.0f); //Stop the player
-            m_bPlayer2Primed = false;
-        }
-    }
-}
-
-
-bool DlgAutoDJ::loadNextTrackFromQueue(bool removeTopMostBeforeLoading)
-{
-    if (removeTopMostBeforeLoading) {
-        //Only remove the top track if this isn't the start of Auto DJ mode.
-        m_pAutoDJTableModel->removeTrack(m_pAutoDJTableModel->index(0, 0));
-    }
-
-    //Get the track at the top of the playlist...
-    TrackPointer nextTrack = m_pAutoDJTableModel->getTrack(m_pAutoDJTableModel->index(0, 0));
-
-    if (!nextTrack) //We ran out of tracks in the queue...
-    {
-        //Disable auto DJ and return...
+        m_pCOPlay1->disconnect(this);
+        m_pCOPlay2->disconnect(this);
+    }
+}
+
+void DlgAutoDJ::player1PositionChanged(double value) {
+    // 95% playback is when we crossfade and do stuff
+    // const float posThreshold = 0.95;
+
+    // 0.05; // 5% playback is crossfade duration
+    const float fadeDuration = m_fadeDuration1;
+
+    // qDebug() << "player1PositionChanged(" << value << ")";
+    if (!m_bAutoDJEnabled) {
+        //nothing to do
+        return;
+    }
+
+    bool deck1Playing = m_pCOPlay1Fb->get() == 1.0f;
+    bool deck2Playing = m_pCOPlay2Fb->get() == 1.0f;
+
+    if (m_eState == ADJ_ENABLE_P1LOADED) {
+        // Auto DJ Start
+        if (!deck1Playing && !deck2Playing) {
+            m_pCOCrossfader->slotSet(-1.0f);  // Move crossfader to the left!
+            m_pCOPlay1->slotSet(1.0f);  // Play the track in player 1
+            removePlayingTrackFromQueue("[Channel1]");
+        } else if (deck1Playing && !deck2Playing) {
+            // Here we are, if first deck was playing before starting Auto DJ
+            // or if it was started just before
+            loadNextTrackFromQueue();
+            m_eState = ADJ_IDLE;
+            // if we start the deck from code we don`t get a signal
+            player1PlayChanged(1.0f);
+            // call function manually
+        } else {
+            m_eState = ADJ_IDLE;
+            player2PlayChanged(1.0f);
+        }
+        return;
+    }
+
+    if (m_eState == ADJ_P2FADING) {
+        if (deck1Playing && !deck2Playing) {
+            loadNextTrackFromQueue();
+            // End State
+            m_pCOCrossfader->slotSet(-1.0f);  // Move crossfader to the left!
+            // qDebug() << "1: m_pCOCrossfader->slotSet(_-1.0f_);";
+            m_eState = ADJ_IDLE;
+        }
+        return;
+    }
+
+    if (m_eState == ADJ_IDLE) {
+        if (m_pCORepeat1->get() == 1.0f) {
+            // repeat disables auto DJ
+            return;
+        }
+    }
+
+    if (value >= m_posThreshold1) {
+        if (m_eState == ADJ_IDLE &&
+            (deck1Playing || m_posThreshold1 >= 1.0f)) {
+            if (!deck2Playing) {
+                // Start Deck 2
+                player2PlayChanged(1.0f);
+                m_pCOPlay2->slotSet(1.0f);
+                if (fadeDuration < 0.0f) {
+                    // Scroll back for pause between tracks
+                    m_pCOPlayPos2->slotSet(m_fadeDuration2);
+                }
+            }
+            removePlayingTrackFromQueue("[Channel2]");
+            m_eState = ADJ_P1FADING;
+        }
+
+        float posFadeEnd = math_min(1.0, m_posThreshold1 + fadeDuration);
+
+        if (value >= posFadeEnd) {
+            // Pre-EndState
+            // m_pCOCrossfader->slotSet(1.0f); //Move crossfader to the right!
+
+            m_pCOPlay1->slotSet(0.0f);  // Stop the player
+            //m_posThreshold = 1.0f - fadeDuration; // back to default
+
+            // does not work always immediately after stop
+            // loadNextTrackFromQueue();
+            // m_eState = ADJ_IDLE; // Fading ready
+        } else {
+            // Crossfade!
+            float crossfadeValue = -1.0f +
+                    2*(value-m_posThreshold1)/(posFadeEnd-m_posThreshold1);
+            // crossfadeValue = -1.0f -> + 1.0f
+            // Move crossfader to the right!
+            m_pCOCrossfader->slotSet(crossfadeValue);
+            // qDebug() << "1: m_pCOCrossfader->slotSet " << crossfadeValue;
+        }
+    }
+}
+
+void DlgAutoDJ::player2PositionChanged(double value) {
+    // 95% playback is when we crossfade and do stuff
+    // const float posThreshold = 0.95;
+
+    // 0.05; // 5% playback is crossfade duration
+    float fadeDuration = m_fadeDuration2;
+
+    //qDebug() << "player2PositionChanged(" << value << ")";
+    if (!m_bAutoDJEnabled) {
+        //nothing to do
+        return;
+    }
+
+    bool deck1Playing = m_pCOPlay1Fb->get() == 1.0f;
+    bool deck2Playing = m_pCOPlay2Fb->get() == 1.0f;
+
+    if (m_eState == ADJ_P1FADING) {
+        if (!deck1Playing && deck2Playing) {
+            // End State
+            // Move crossfader to the right!
+            m_pCOCrossfader->slotSet(1.0f);
+            // qDebug() << "1: m_pCOCrossfader->slotSet(_1.0f_);";
+            m_eState = ADJ_IDLE;
+            loadNextTrackFromQueue();
+        }
+        return;
+    }
+
+    if (m_eState == ADJ_IDLE) {
+        if (m_pCORepeat2->get() == 1.0f) {
+            //repeat disables auto DJ
+            return;
+        }
+    }
+
+    if (value >= m_posThreshold2) {
+        if (m_eState == ADJ_IDLE &&
+            (deck2Playing || m_posThreshold2 >= 1.0f)) {
+            if (!deck1Playing) {
+                player1PlayChanged(1.0f);
+                m_pCOPlay1->slotSet(1.0f);
+                if (fadeDuration < 0) {
+                    // Scroll back for pause between tracks
+                    m_pCOPlayPos1->slotSet(m_fadeDuration1);
+                }
+            }
+            removePlayingTrackFromQueue("[Channel1]");
+            m_eState = ADJ_P2FADING;
+        }
+
+        float posFadeEnd = math_min(1.0, m_posThreshold2 + fadeDuration);
+
+        if (value >= posFadeEnd) {
+            // Pre-End State
+            //m_pCOCrossfader->slotSet(-1.0f); //Move crossfader to the left!
+
+            m_pCOPlay2->slotSet(0.0f);  // Stop the player
+
+            //m_posThreshold = 1.0f - fadeDuration; // back to default
+
+            // does not work always immediately after stop
+            // loadNextTrackFromQueue();
+            // m_eState = ADJ_IDLE; // Fading ready
+        } else {
+            //Crossfade!
+            float crossfadeValue = 1.0f -
+                    2*(value-m_posThreshold2)/(posFadeEnd-m_posThreshold2);
+            // crossfadeValue = 1.0f -> + -1.0f
+            m_pCOCrossfader->slotSet(crossfadeValue); //Move crossfader to the right!
+            // qDebug() << "2: m_pCOCrossfader->slotSet " << crossfadeValue;
+        }
+    }
+}
+
+TrackPointer DlgAutoDJ::getNextTrackFromQueue() {
+    // Get the track at the top of the playlist...
+    TrackPointer nextTrack;
+
+    while (true) {
+        nextTrack = m_pAutoDJTableModel->getTrack(
+            m_pAutoDJTableModel->index(0, 0));
+
+        if (nextTrack) {
+            if (nextTrack->exists()) {
+                // found a valid Track
+                return nextTrack;
+            } else {
+                // Remove missing song from auto DJ playlist
+                m_pAutoDJTableModel->removeTrack(
+                    m_pAutoDJTableModel->index(0, 0));
+            }
+        } else {
+            // we are running out of tracks
+            break;
+        }
+    }
+    return nextTrack;
+}
+
+bool DlgAutoDJ::loadNextTrackFromQueue() {
+    TrackPointer nextTrack = getNextTrackFromQueue();
+
+    // We ran out of tracks in the queue...
+    if (!nextTrack) {
+        // Disable auto DJ and return...
         pushButtonAutoDJ->setChecked(false);
         return false;
     }
 
-    //m_bNextTrackAlreadyLoaded = false;
-
     emit(loadTrack(nextTrack));
-
-    return true;
+    return true;
+}
+
+bool DlgAutoDJ::removePlayingTrackFromQueue(QString group) {
+    TrackPointer nextTrack, loadedTrack;
+    int nextId = 0, loadedId = 0;
+
+    // Get the track at the top of the playlist...
+    nextTrack = m_pAutoDJTableModel->getTrack(m_pAutoDJTableModel->index(0, 0));
+    if (nextTrack) {
+        nextId = nextTrack->getId();
+    }
+
+    // Get loaded track
+    loadedTrack = PlayerInfo::Instance().getTrackInfo(group);
+    if (loadedTrack) {
+        loadedId = loadedTrack->getId();
+    }
+
+    // When enable auto DJ and Topmost Song is already on second deck, nothing to do
+    //  BaseTrackPlayer::getLoadedTrack()
+    //  pTrack = PlayerInfo::Instance().getCurrentPlayingTrack();
+
+    if (loadedId != nextId) {
+        // Do not remove when the user has loaded a track manualy
+        return false;
+    }
+
+    // remove the top track
+    m_pAutoDJTableModel->removeTrack(m_pAutoDJTableModel->index(0, 0));
+
+    return true;
+}
+
+void DlgAutoDJ::player1PlayChanged(double value) {
+    //qDebug() << "player1PlayChanged(" << value << ")";
+    if (!m_bAutoDJEnabled) {
+        return;
+    }
+
+    if (value == 1.0f && m_eState == ADJ_IDLE) {
+        TrackPointer loadedTrack =
+                PlayerInfo::Instance().getTrackInfo("[Channel1]");
+        if (loadedTrack) {
+            int TrackDuration = loadedTrack->getDuration();
+            qDebug() << "TrackDuration = " << TrackDuration;
+
+            int autoDjTransition = spinBoxTransition->value();
+
+            if (TrackDuration > autoDjTransition) {
+                m_fadeDuration1 = static_cast<float>(autoDjTransition) /
+                        static_cast<float>(TrackDuration);
+            } else {
+                m_fadeDuration1 = 0;
+            }
+
+            if (autoDjTransition > 0) {
+                m_posThreshold1 = 1.0f - m_fadeDuration1;
+            } else {
+                // in case of pause
+                m_posThreshold1 = 1.0f;
+            }
+            qDebug() << "m_fadeDuration1 = " << m_fadeDuration1;
+        }
+    }
+}
+
+void DlgAutoDJ::player2PlayChanged(double value) {
+    //qDebug() << "player2PlayChanged(" << value << ")";
+    if (!m_bAutoDJEnabled) {
+        return;
+    }
+
+    if (value == 1.0f && m_eState == ADJ_IDLE) {
+        TrackPointer loadedTrack =
+                PlayerInfo::Instance().getTrackInfo("[Channel2]");
+        if (loadedTrack) {
+            int TrackDuration = loadedTrack->getDuration();
+            qDebug() << "TrackDuration = " << TrackDuration;
+
+            int autoDjTransition = spinBoxTransition->value();
+
+            if (TrackDuration > autoDjTransition) {
+                m_fadeDuration2 = static_cast<float>(autoDjTransition) /
+                        static_cast<float>(TrackDuration);
+            } else {
+                m_fadeDuration2 = 0;
+            }
+
+            if (autoDjTransition > 0) {
+                m_posThreshold2 = 1.0f - m_fadeDuration2;
+            } else {
+                // in case of pause
+                m_posThreshold2 = 1.0f;
+            }
+            qDebug() << "m_fadeDuration2 = " << m_fadeDuration2;
+        }
+    }
+}
+
+void DlgAutoDJ::transitionValueChanged(int value) {
+    if (m_bAutoDJEnabled && m_eState == ADJ_IDLE) {
+        if (m_pCOPlay1Fb->get() == 1.0f) {
+            player1PlayChanged(1.0f);
+        }
+        if (m_pCOPlay2Fb->get() == 1.0f) {
+            player2PlayChanged(1.0f);
+        }
+    }
+    m_pConfig->set(ConfigKey(CONFIG_KEY, kTransitionPreferenceName),
+                   ConfigValue(value));
+}
+
+bool DlgAutoDJ::appendTrack(int trackId) {
+    return m_pAutoDJTableModel->appendTrack(trackId);
 }

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2011-04-24 06:00:11 +0000
+++ mixxx/src/dlgautodj.h	2012-03-12 04:06:20 +0000
@@ -31,19 +31,35 @@
     virtual void loadSelectedTrack();
     virtual void loadSelectedTrackToGroup(QString group);
     virtual void moveSelection(int delta);
+    virtual bool appendTrack(int trackId);
 
   public slots:
     void shufflePlaylist(bool buttonChecked);
+    void skipNext(bool buttonChecked);
+    void fadeNow(bool buttonChecked);
     void toggleAutoDJ(bool toggle);
     void player1PositionChanged(double value);
     void player2PositionChanged(double value);
+    void player1PlayChanged(double value);
+    void player2PlayChanged(double value);
+    void transitionValueChanged(int value);
 
   signals:
     void loadTrack(TrackPointer tio);
     void loadTrackToPlayer(TrackPointer tio, QString group);
 
   private:
-    bool loadNextTrackFromQueue(bool removeTopMostBeforeLoading);
+    enum ADJstates {
+        ADJ_IDLE = 0,
+        ADJ_P1FADING,
+        ADJ_P2FADING,
+        ADJ_ENABLE_P1LOADED,
+        ADJ_ENABLE_P1PLAYING
+    };
+
+    TrackPointer getNextTrackFromQueue();
+    bool loadNextTrackFromQueue();
+    bool removePlayingTrackFromQueue(QString group);
 
     ConfigObject<ConfigValue>* m_pConfig;
     TrackCollection* m_pTrackCollection;
@@ -51,17 +67,24 @@
     PlaylistTableModel* m_pAutoDJTableModel;
     PlaylistDAO& m_playlistDao;
     bool m_bAutoDJEnabled;
-    bool m_bNextTrackAlreadyLoaded; /** Makes our Auto DJ logic assume the
-                                        next track that should be played is
-                                        already loaded. We need this flag to
-                                        make our first-track-gets-loaded-but-
-                                        not-removed-from-the-queue behaviour
-                                        work. */
-    bool m_bPlayer1Primed, m_bPlayer2Primed;
+
+    // Makes our Auto DJ logic assume the next track that should be played is
+    // already loaded. We need this flag to make our
+    // first-track-gets-loaded-but- not-removed-from-the-queue behaviour work.
+    bool m_bNextTrackAlreadyLoaded;
+
+    bool m_bFadeNow;
+    enum ADJstates m_eState;
+    float m_posThreshold1;
+    float m_posThreshold2;
+    float m_fadeDuration1;
+    float m_fadeDuration2;
     ControlObjectThreadMain* m_pCOPlayPos1;
     ControlObjectThreadMain* m_pCOPlayPos2;
     ControlObjectThreadMain* m_pCOPlay1;
     ControlObjectThreadMain* m_pCOPlay2;
+    ControlObjectThreadMain* m_pCOPlay1Fb;
+    ControlObjectThreadMain* m_pCOPlay2Fb;
     ControlObjectThreadMain* m_pCORepeat1;
     ControlObjectThreadMain* m_pCORepeat2;
     ControlObjectThreadMain* m_pCOCrossfader;
@@ -82,7 +105,7 @@
 
 
 #define _blah if ((QDate::currentDate().day() == 1) && (QDate::currentDate().month() == 4)) \
-             pushButtonAutoDJ->setText("\x45\x6e\x61\x62\x6c\x65\x20\x50\x65\x65" \
+        pushButtonAutoDJ->setText("\x45\x6e\x61\x62\x6c\x65\x20\x50\x65\x65" \
                                   "\x20\x42\x72\x65\x61\x6b\x20\x4d\x6f\x64\x65")
 
 

=== modified file 'mixxx/src/dlgautodj.ui'
--- mixxx/src/dlgautodj.ui	2011-10-05 03:30:02 +0000
+++ mixxx/src/dlgautodj.ui	2012-03-12 04:06:20 +0000
@@ -6,13 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>582</width>
+    <width>500</width>
     <height>399</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Manage</string>
   </property>
+  <property name="styleSheet">
+   <string notr="true">#pushButtonShuffle{
+	border-image: url(:/images/autodj/media-playlist-shuffle.svg);
+}
+
+#pushButtonSkipNext{
+	border-image: url(:/images/autodj/bottom.svg);
+}
+
+#pushButtonFadeNow{
+	border-image: url(:/images/autodj/stock_mail-send-receive.svg);
+}
+
+</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
@@ -25,13 +40,89 @@
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
      <item>
       <widget class="QPushButton" name="pushButtonShuffle">
-       <property name="text">
-        <string>Shuffle playlist</string>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Shuffle Playlist</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonSkipNext">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Skip Next Track</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Transition [sec]</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="spinBoxTransition">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>45</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="minimum">
+        <number>-9</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonFadeNow">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Fade Now</string>
+       </property>
+       <property name="text">
+        <string/>
        </property>
       </widget>
      </item>
@@ -42,24 +133,17 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
+         <width>1</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Add tracks to the queue below...</string>
-       </property>
-       <property name="buddy" >
-        <cstring>m_pTrackTablePlaceholder</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
       <widget class="QPushButton" name="pushButtonAutoDJ">
+       <property name="toolTip">
+        <string>Enable Auto DJ</string>
+       </property>
        <property name="text">
         <string>Enable Auto DJ</string>
        </property>
@@ -88,6 +172,12 @@
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="showGrid">
       <bool>true</bool>
      </property>
@@ -95,6 +185,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../res/mixxx.qrc"/>
+ </resources>
  <connections/>
 </ui>

=== modified file 'mixxx/src/library/autodjfeature.cpp'
--- mixxx/src/library/autodjfeature.cpp	2011-10-12 17:29:43 +0000
+++ mixxx/src/library/autodjfeature.cpp	2012-03-12 04:06:20 +0000
@@ -23,6 +23,7 @@
           m_pConfig(pConfig),
           m_pTrackCollection(pTrackCollection),
           m_playlistDao(pTrackCollection->getPlaylistDAO()) {
+    m_pAutoDJView = NULL;
 }
 
 AutoDJFeature::~AutoDJFeature() {
@@ -36,47 +37,43 @@
     return QIcon(":/images/library/ic_library_autodj.png");
 }
 
-void AutoDJFeature::bindWidget(WLibrarySidebar* sidebarWidget,
+void AutoDJFeature::bindWidget(WLibrarySidebar* /*sidebarWidget*/,
                                WLibrary* libraryWidget,
                                MixxxKeyboard* keyboard) {
-
-    DlgAutoDJ* pAutoDJView = new DlgAutoDJ(libraryWidget,
-                                           m_pConfig,
-                                           m_pTrackCollection,
-                                           keyboard);
-    pAutoDJView->installEventFilter(keyboard);
-    libraryWidget->registerView(m_sAutoDJViewName, pAutoDJView);
-    connect(pAutoDJView, SIGNAL(loadTrack(TrackPointer)),
+    m_pAutoDJView = new DlgAutoDJ(libraryWidget,
+                                  m_pConfig,
+                                  m_pTrackCollection,
+                                  keyboard);
+    m_pAutoDJView->installEventFilter(keyboard);
+    libraryWidget->registerView(m_sAutoDJViewName, m_pAutoDJView);
+    connect(m_pAutoDJView, SIGNAL(loadTrack(TrackPointer)),
             this, SIGNAL(loadTrack(TrackPointer)));
-    connect(pAutoDJView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
+    connect(m_pAutoDJView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
 }
 
 TreeItemModel* AutoDJFeature::getChildModel() {
-	return &m_childModel;
+    return &m_childModel;
 }
 
 void AutoDJFeature::activate() {
     //qDebug() << "AutoDJFeature::activate()";
     //emit(showTrackModel(m_pAutoDJTableModelProxy));
-    emit(switchToView("Auto DJ"));
-}
-
-void AutoDJFeature::activateChild(const QModelIndex& index) {
-
-}
-
-void AutoDJFeature::onRightClick(const QPoint& globalPos) {
-}
-
-void AutoDJFeature::onRightClickChild(const QPoint& globalPos,
-                                            QModelIndex index) {
+    emit(switchToView(m_sAutoDJViewName));
+}
+
+void AutoDJFeature::activateChild(const QModelIndex& /*index*/) {
+}
+
+void AutoDJFeature::onRightClick(const QPoint& /*globalPos*/) {
+}
+
+void AutoDJFeature::onRightClickChild(const QPoint& /*globalPos*/,
+                                      QModelIndex /*index*/) {
 }
 
 bool AutoDJFeature::dropAccept(QUrl url) {
-
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
-
     TrackDAO &trackDao = m_pTrackCollection->getTrackDAO();
 
     //If a track is dropped onto a playlist's name, but the track isn't in the library,
@@ -98,12 +95,17 @@
     }
 
     // TODO(XXX) No feedback on whether this worked.
-    int playlistId = m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
-    m_playlistDao.appendTrackToPlaylist(trackId, playlistId);
+    if (m_pAutoDJView) {
+        m_pAutoDJView->appendTrack(trackId);
+    } else {
+        int playlistId = m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
+        m_playlistDao.appendTrackToPlaylist(trackId, playlistId);
+    }
+
     return true;
 }
 
-bool AutoDJFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+bool AutoDJFeature::dropAcceptChild(const QModelIndex& /*index*/, QUrl /*url*/) {
     return false;
 }
 
@@ -112,10 +114,10 @@
     return SoundSourceProxy::isFilenameSupported(file.fileName());
 }
 
-bool AutoDJFeature::dragMoveAcceptChild(const QModelIndex& index,
-                                              QUrl url) {
+bool AutoDJFeature::dragMoveAcceptChild(const QModelIndex& /*index*/,
+                                        QUrl /*url*/) {
     return false;
 }
-void AutoDJFeature::onLazyChildExpandation(const QModelIndex &index){
+void AutoDJFeature::onLazyChildExpandation(const QModelIndex& /*index*/){
     //Nothing to do because the childmodel is not of lazy nature.
 }

=== modified file 'mixxx/src/library/autodjfeature.h'
--- mixxx/src/library/autodjfeature.h	2011-03-10 13:37:21 +0000
+++ mixxx/src/library/autodjfeature.h	2012-03-12 04:06:20 +0000
@@ -11,13 +11,14 @@
 #include "library/dao/playlistdao.h"
 #include "configobject.h"
 #include "treeitemmodel.h"
+#include "dlgautodj.h"
 
 class PlaylistTableModel;
 class TrackCollection;
 
 class AutoDJFeature : public LibraryFeature {
     Q_OBJECT
-    public:
+  public:
     AutoDJFeature(QObject* parent,
                   ConfigObject<ConfigValue>* pConfig,
                   TrackCollection* pTrackCollection);
@@ -37,19 +38,20 @@
 
     TreeItemModel* getChildModel();
 
-public slots:
+  public slots:
     void activate();
     void activateChild(const QModelIndex& index);
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
     void onLazyChildExpandation(const QModelIndex& index);
 
-private:
+  private:
     ConfigObject<ConfigValue>* m_pConfig;
     TrackCollection* m_pTrackCollection;
     PlaylistDAO& m_playlistDao;
     const static QString m_sAutoDJViewName;
     TreeItemModel m_childModel;
+    DlgAutoDJ* m_pAutoDJView;
 };
 
 

=== modified file 'mixxx/src/library/browse/browsefeature.cpp'
--- mixxx/src/library/browse/browsefeature.cpp	2012-01-07 08:36:51 +0000
+++ mixxx/src/library/browse/browsefeature.cpp	2012-03-12 04:06:20 +0000
@@ -14,7 +14,8 @@
 #include "library/trackcollection.h"
 #include "library/dao/trackdao.h"
 
-BrowseFeature::BrowseFeature(QObject* parent, ConfigObject<ConfigValue>* pConfig,
+BrowseFeature::BrowseFeature(QObject* parent,
+                             ConfigObject<ConfigValue>* pConfig,
                              TrackCollection* pTrackCollection,
                              RecordingManager* pRecordingManager)
         : LibraryFeature(parent),
@@ -22,44 +23,47 @@
           m_browseModel(this, pTrackCollection, pRecordingManager),
           m_proxyModel(&m_browseModel),
           m_pTrackCollection(pTrackCollection) {
-
     m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_proxyModel.setSortCaseSensitivity(Qt::CaseInsensitive);
 
-    //The invisible root item of the child model
+    // The invisible root item of the child model
     TreeItem* rootItem = new TreeItem();
 
-    TreeItem* quick_link = new TreeItem(tr("Quick Links"), QUICK_LINK_NODE ,this , rootItem);
+    TreeItem* quick_link = new TreeItem(
+        tr("Quick Links"), QUICK_LINK_NODE, this, rootItem);
     rootItem->appendChild(quick_link);
 
-    //Create the 'devices' shortcut
+    // Create the 'devices' shortcut
 #if defined(__WINDOWS__)
-    TreeItem* devices_link = new TreeItem(tr("Devices"), DEVICE_NODE ,this , rootItem);
+    TreeItem* devices_link = new TreeItem(
+        tr("Devices"), DEVICE_NODE, this, rootItem);
     rootItem->appendChild(devices_link);
-    //show drive letters
+    // show drive letters
     QFileInfoList drives = QDir::drives();
-    //show drive letters
-    foreach(QFileInfo drive, drives){
+    // show drive letters
+    foreach (QFileInfo drive, drives) {
         TreeItem* driveLetter = new TreeItem(
-                        drive.canonicalPath(), // displays C:
-                        drive.filePath(), //Displays C:/
-                        this ,
-                        devices_link);
+            drive.canonicalPath(),  //  displays C:
+            drive.filePath(),  // Displays C:/
+            this ,
+            devices_link);
         devices_link->appendChild(driveLetter);
     }
 #elif defined(__APPLE__)
-    //Apple hides the base Linux file structure
-    //But all devices are mounted at /Volumes
-    TreeItem* devices_link = new TreeItem(tr("Devices"), "/Volumes/", this , rootItem);
+    // Apple hides the base Linux file structure But all devices are mounted at
+    // /Volumes
+    TreeItem* devices_link = new TreeItem(
+        tr("Devices"), "/Volumes/", this, rootItem);
     rootItem->appendChild(devices_link);
-#else //LINUX
-    TreeItem* devices_link = new TreeItem(tr("Removable Devices"), "/media/", this , rootItem);
+#else  // LINUX
+    TreeItem* devices_link = new TreeItem(
+        tr("Removable Devices"), "/media/", this, rootItem);
     rootItem->appendChild(devices_link);
 
-    //show root directory on UNIX-based operating systems
-    TreeItem* root_folder_item = new TreeItem(QDir::rootPath(), QDir::rootPath(),this , rootItem);
+    // show root directory on UNIX-based operating systems
+    TreeItem* root_folder_item = new TreeItem(
+        QDir::rootPath(), QDir::rootPath(), this, rootItem);
     rootItem->appendChild(root_folder_item);
-
 #endif
 
     /*
@@ -76,34 +80,43 @@
      * deletion.
      */
 
-    //Add a shortcut to the Music folder which Mixxx uses
-    QString mixxx_music_dir = m_pConfig->getValueString(ConfigKey("[Playlist]","Directory"));
-    QString os_music_folder_dir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
-    QString os_documents_folder_dir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
-    QString os_home_folder_dir = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
-    QString os_desktop_folder_dir = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
+    // Add a shortcut to the Music folder which Mixxx uses
+    QString mixxx_music_dir = m_pConfig->getValueString(
+        ConfigKey("[Playlist]", "Directory"));
+    QString os_music_folder_dir = QDesktopServices::storageLocation(
+        QDesktopServices::MusicLocation);
+    QString os_documents_folder_dir = QDesktopServices::storageLocation(
+        QDesktopServices::DocumentsLocation);
+    QString os_home_folder_dir = QDesktopServices::storageLocation(
+        QDesktopServices::HomeLocation);
+    QString os_desktop_folder_dir = QDesktopServices::storageLocation(
+        QDesktopServices::DesktopLocation);
 
-    TreeItem* mixxx_library_dir_item = new TreeItem(tr("Mixxx Library"), mixxx_music_dir +"/" ,this , quick_link);
+    TreeItem* mixxx_library_dir_item = new TreeItem(
+        tr("Mixxx Library"), mixxx_music_dir + "/", this, quick_link);
     quick_link->appendChild(mixxx_library_dir_item);
 
-    TreeItem*os_home_dir_item = new TreeItem(tr("Home"), os_home_folder_dir +"/" , this , quick_link);
+    TreeItem* os_home_dir_item = new TreeItem(
+        tr("Home"), os_home_folder_dir + "/", this, quick_link);
     quick_link->appendChild(os_home_dir_item);
 
-    TreeItem*os_music_dir_item = new TreeItem(tr("Music"), os_music_folder_dir +"/" , this , quick_link);
+    TreeItem* os_music_dir_item = new TreeItem(
+        tr("Music"), os_music_folder_dir + "/", this, quick_link);
     quick_link->appendChild(os_music_dir_item);
 
-    TreeItem*os_docs_dir_item = new TreeItem(tr("Documents"), os_documents_folder_dir +"/" , this , quick_link);
+    TreeItem* os_docs_dir_item = new TreeItem(
+        tr("Documents"), os_documents_folder_dir + "/", this, quick_link);
     quick_link->appendChild(os_docs_dir_item);
 
-    TreeItem*os_desktop_dir_item = new TreeItem(tr("Desktop"), os_desktop_folder_dir +"/" , this , quick_link);
+    TreeItem* os_desktop_dir_item = new TreeItem(
+        tr("Desktop"), os_desktop_folder_dir + "/", this, quick_link);
     quick_link->appendChild(os_desktop_dir_item);
 
-    //initialize the model
+    // initialize the model
     m_childModel.setRootItem(rootItem);
 }
 
 BrowseFeature::~BrowseFeature() {
-
 }
 
 QVariant BrowseFeature::title() {
@@ -119,18 +132,24 @@
 }
 
 bool BrowseFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
 bool BrowseFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+    Q_UNUSED(index);
+    Q_UNUSED(url);
     return false;
 }
 
 bool BrowseFeature::dragMoveAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
 bool BrowseFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
+    Q_UNUSED(index);
+    Q_UNUSED(url);
     return false;
 }
 
@@ -143,59 +162,64 @@
  */
 void BrowseFeature::activateChild(const QModelIndex& index) {
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-    qDebug() << "BrowseFeature::activateChild " << item->data() << " " << item->dataPath();
+    qDebug() << "BrowseFeature::activateChild " << item->data() << " "
+             << item->dataPath();
     m_browseModel.setPath(item->dataPath().toString());
     emit(showTrackModel(&m_proxyModel));
-
 }
 
 void BrowseFeature::onRightClick(const QPoint& globalPos) {
-}
-
-void BrowseFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
-}
+    Q_UNUSED(globalPos);
+}
+
+void BrowseFeature::onRightClickChild(const QPoint& globalPos,
+                                      QModelIndex index) {
+    Q_UNUSED(globalPos);
+    Q_UNUSED(index);
+}
+
 /*
  * This is called whenever you double click or use the triangle symbol to expand
  * the subtree. The method will read the subfolders.
  */
 void BrowseFeature::onLazyChildExpandation(const QModelIndex &index){
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-    qDebug() << "BrowseFeature::onLazyChildExpandation " << item->data() << " " << item->dataPath();
+    qDebug() << "BrowseFeature::onLazyChildExpandation " << item->data()
+             << " " << item->dataPath();
 
     // If the item is a build-in node, e.g., 'QuickLink' return
-    if(item->dataPath().toString() == QUICK_LINK_NODE)
+    if (item->dataPath().toString() == QUICK_LINK_NODE) {
         return;
+    }
 
-    //Before we populate the subtree, we need to delete old subtrees
-   m_childModel.removeRows(0, item->childCount(), index);
+    // Before we populate the subtree, we need to delete old subtrees
+    m_childModel.removeRows(0, item->childCount(), index);
 
     // List of subfolders or drive letters
     QList<TreeItem*> folders;
 
     // If we are on the special device node
-    if(item->dataPath().toString() == DEVICE_NODE){
-       //Repopulate drive list
+    if (item->dataPath().toString() == DEVICE_NODE) {
+        // Repopulate drive list
         QFileInfoList drives = QDir::drives();
-        //show drive letters
-        foreach(QFileInfo drive, drives){
+        // show drive letters
+        foreach (QFileInfo drive, drives) {
             TreeItem* driveLetter = new TreeItem(
-                            drive.canonicalPath(), // displays C:
-                            drive.filePath(), //Displays C:/
-                            this ,
-                            item);
+                drive.canonicalPath(), // displays C:
+                drive.filePath(), //Displays C:/
+                this ,
+                item);
             folders << driveLetter;
         }
-
-    }
-    else // we assume that the path refers to a folder in the file system
-    {
-        //populate childs
+    } else {  // we assume that the path refers to a folder in the file system
+        // populate childs
         QDir dir(item->dataPath().toString());
-        QFileInfoList all = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+        QFileInfoList all = dir.entryInfoList(
+            QDir::Dirs | QDir::NoDotAndDotDot);
 
         // loop through all the item and construct the childs
-        foreach(QFileInfo one, all){
-            //Skip folders that end with .app on OS X
+        foreach (QFileInfo one, all) {
+            // Skip folders that end with .app on OS X
 #if defined(__APPLE__)
             if (one.isDir() && one.fileName().endsWith(".app"))
                 continue;
@@ -203,15 +227,17 @@
             // We here create new items for the sidebar models
             // Once the items are added to the TreeItemModel,
             // the models takes ownership of them and ensures their deletion
-            TreeItem* folder = new TreeItem(one.fileName(),
-                                            item->dataPath().toString().append(one.fileName() +"/"),
-                                            this,
-                                            item);
+            TreeItem* folder = new TreeItem(
+                one.fileName(),
+                item->dataPath().toString().append(one.fileName() +"/"),
+                this, item);
             folders << folder;
         }
     }
-    //we need to check here if subfolders are found
-    //On Ubuntu 10.04, otherwise, this will draw an icon although the folder has no subfolders
-    if(!folders.isEmpty())
-       m_childModel.insertRows(folders, 0, folders.size() , index);
+    // we need to check here if subfolders are found
+    // On Ubuntu 10.04, otherwise, this will draw an icon although the folder
+    // has no subfolders
+    if (!folders.isEmpty()) {
+        m_childModel.insertRows(folders, 0, folders.size() , index);
+    }
 }

=== modified file 'mixxx/src/library/browse/browsefeature.h'
--- mixxx/src/library/browse/browsefeature.h	2011-03-30 21:53:33 +0000
+++ mixxx/src/library/browse/browsefeature.h	2012-03-12 04:06:20 +0000
@@ -44,8 +44,8 @@
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
 
     void onLazyChildExpandation(const QModelIndex& index);
-  
-   signals:
+
+  signals:
     void setRootIndex(const QModelIndex&);
 
   private:

=== modified file 'mixxx/src/library/browse/browsetablemodel.cpp'
--- mixxx/src/library/browse/browsetablemodel.cpp	2011-12-28 20:30:15 +0000
+++ mixxx/src/library/browse/browsetablemodel.cpp	2012-03-12 04:06:20 +0000
@@ -16,13 +16,14 @@
 #include "audiotagger.h"
 
 
-BrowseTableModel::BrowseTableModel(QObject* parent, TrackCollection* pTrackCollection,
+BrowseTableModel::BrowseTableModel(QObject* parent,
+                                   TrackCollection* pTrackCollection,
                                    RecordingManager* pRecordingManager)
-        : TrackModel(pTrackCollection->getDatabase(), // TrackCollections m_db (defaultConnection)
+        : TrackModel(pTrackCollection->getDatabase(),
                      "mixxx.db.model.browse"),
           QStandardItemModel(parent),
           m_pTrackCollection(pTrackCollection),
-         m_pRecordingManager(pRecordingManager) {
+          m_pRecordingManager(pRecordingManager) {
     QStringList header_data;
     header_data.insert(COLUMN_FILENAME, tr("Filename"));
     header_data.insert(COLUMN_ARTIST, tr("Artist"));
@@ -50,23 +51,24 @@
     addSearchColumn(COLUMN_COMMENT);
 
     setHorizontalHeaderLabels(header_data);
-    //register the QList<T> as a metatype since we use QueuedConnection below
-    qRegisterMetaType< QList< QList<QStandardItem*> > >("QList< QList<QStandardItem*> >");
+    // register the QList<T> as a metatype since we use QueuedConnection below
+    qRegisterMetaType< QList< QList<QStandardItem*> > >(
+        "QList< QList<QStandardItem*> >");
     qRegisterMetaType<BrowseTableModel*>("BrowseTableModel*");
 
     connect(BrowseThread::getInstance(), SIGNAL(clearModel(BrowseTableModel*)),
             this, SLOT(slotClear(BrowseTableModel*)),
             Qt::QueuedConnection);
 
-    connect(BrowseThread::getInstance(), SIGNAL(rowsAppended(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
-            this, SLOT(slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
-            Qt::QueuedConnection);
-
+    connect(
+        BrowseThread::getInstance(),
+        SIGNAL(rowsAppended(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
+        this,
+        SLOT(slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
+        Qt::QueuedConnection);
 }
 
-BrowseTableModel::~BrowseTableModel()
-{
-
+BrowseTableModel::~BrowseTableModel() {
 }
 
 const QList<int>& BrowseTableModel::searchColumns() const {
@@ -77,20 +79,19 @@
     m_searchColumns.push_back(index);
 }
 
-void BrowseTableModel::setPath(QString absPath)
-{
+void BrowseTableModel::setPath(QString absPath) {
     m_current_path = absPath;
     BrowseThread::getInstance()->executePopulation(m_current_path, this);
-
 }
 
-TrackPointer BrowseTableModel::getTrack(const QModelIndex& index) const
-{
+TrackPointer BrowseTableModel::getTrack(const QModelIndex& index) const {
     QString track_location = getTrackLocation(index);
-    if(m_pRecordingManager->getRecordingLocation() == track_location) {
-        QMessageBox::critical(0, tr("Mixxx Library"),tr("Could not load the following file because"
-                                                        " it is in use by Mixxx or another application.")
-                              + "\n" +track_location);
+    if (m_pRecordingManager->getRecordingLocation() == track_location) {
+        QMessageBox::critical(
+            0, tr("Mixxx Library"),
+            tr("Could not load the following file because"
+               " it is in use by Mixxx or another application.")
+            + "\n" +track_location);
         return TrackPointer();
     }
 
@@ -104,29 +105,27 @@
     return track_dao.getTrack(track_id);
 }
 
-QString BrowseTableModel::getTrackLocation(const QModelIndex& index) const
-{
+QString BrowseTableModel::getTrackLocation(const QModelIndex& index) const {
     int row = index.row();
 
     QModelIndex index2 = this->index(row, COLUMN_LOCATION);
     return data(index2).toString();
-
 }
 
 int BrowseTableModel::getTrackId(const QModelIndex& index) const {
-   Q_UNUSED(index);
-   // We can't implement this as it stands.
+    Q_UNUSED(index);
+    // We can't implement this as it stands.
     return -1;
 }
 
 const QLinkedList<int> BrowseTableModel::getTrackRows(int trackId) const {
-   Q_UNUSED(trackId);
-   // We can't implement this as it stands.
-   return QLinkedList<int>();
+    Q_UNUSED(trackId);
+    // We can't implement this as it stands.
+    return QLinkedList<int>();
 }
 
 void BrowseTableModel::search(const QString& searchText) {
-   Q_UNUSED(searchText);
+    Q_UNUSED(searchText);
 }
 
 const QString BrowseTableModel::currentSearch() const {
@@ -142,16 +141,14 @@
 }
 
 void BrowseTableModel::moveTrack(const QModelIndex&, const QModelIndex&) {
-
 }
 
 QItemDelegate* BrowseTableModel::delegateForColumn(const int) {
     return NULL;
 }
 
-void BrowseTableModel::removeTrack(const QModelIndex& index)
-{
-    if(!index.isValid()) {
+void BrowseTableModel::removeTrack(const QModelIndex& index) {
+    if (!index.isValid()) {
         return;
     }
     QStringList trackLocations;
@@ -159,8 +156,7 @@
     removeTracks(trackLocations);
 }
 
-void BrowseTableModel::removeTracks(const QModelIndexList& indices)
-{
+void BrowseTableModel::removeTracks(const QModelIndexList& indices) {
     QStringList trackLocations;
     foreach (QModelIndex index, indices) {
         if (!index.isValid()) {
@@ -176,11 +172,12 @@
         return;
 
     // Ask user if s/he is sure
-    if (QMessageBox::question(NULL, tr("Mixxx Library"),
-                             tr("Warning: This will permanently delete the following files:")
-                             + "\n" + trackLocations.join("\n") + "\n" +
-                             tr("Are you sure you want to delete these files from your computer?"),
-                              QMessageBox::Yes, QMessageBox::Abort) == QMessageBox::Abort) {
+    if (QMessageBox::question(
+        NULL, tr("Mixxx Library"),
+        tr("Warning: This will permanently delete the following files:")
+        + "\n" + trackLocations.join("\n") + "\n" +
+        tr("Are you sure you want to delete these files from your computer?"),
+        QMessageBox::Yes, QMessageBox::Abort) == QMessageBox::Abort) {
         return;
     }
 
@@ -191,8 +188,10 @@
     foreach (QString track_location, trackLocations) {
         // If track is in use or deletion fails, show an error message.
         if (isTrackInUse(track_location) || !QFile::remove(track_location)) {
-            QMessageBox::critical(0, tr("Mixxx Library"),tr("Could not delete the following file because"
-                                                            " it is in use by Mixxx or another application:") + "\n" +track_location);
+            QMessageBox::critical(
+                0, tr("Mixxx Library"),
+                tr("Could not delete the following file because"
+                   " it is in use by Mixxx or another application:") + "\n" +track_location);
             continue;
         }
 
@@ -213,20 +212,19 @@
     }
 }
 
-bool BrowseTableModel::addTrack(const QModelIndex& index, QString location)
-{
+bool BrowseTableModel::addTrack(const QModelIndex& index, QString location) {
     Q_UNUSED(index);
     Q_UNUSED(location);
-   return false;
+    return false;
 }
 
 QMimeData* BrowseTableModel::mimeData(const QModelIndexList &indexes) const {
     QMimeData *mimeData = new QMimeData();
     QList<QUrl> urls;
 
-    //Ok, so the list of indexes we're given contains separates indexes for
-    //each column, so even if only one row is selected, we'll have like 7 indexes.
-    //We need to only count each row once:
+    // Ok, so the list of indexes we're given contains separates indexes for
+    // each column, so even if only one row is selected, we'll have like 7
+    // indexes.  We need to only count each row once:
     QList<int> rows;
 
     foreach (QModelIndex index, indexes) {
@@ -234,9 +232,9 @@
             if (!rows.contains(index.row())) {
                 rows.push_back(index.row());
                 QUrl url = QUrl::fromLocalFile(getTrackLocation(index));
-                if (!url.isValid())
+                if (!url.isValid()) {
                     qDebug() << "ERROR invalid url\n";
-                else {
+                } else {
                     urls.append(url);
                     qDebug() << "Appending URL:" << url;
                 }
@@ -247,22 +245,23 @@
     return mimeData;
 }
 
-void BrowseTableModel::slotClear(BrowseTableModel* caller_object)
-{
-    if(caller_object == this)
+void BrowseTableModel::slotClear(BrowseTableModel* caller_object) {
+    if (caller_object == this) {
         removeRows(0, rowCount());
+    }
 }
 
-void BrowseTableModel::slotInsert(const QList< QList<QStandardItem*> >& rows, BrowseTableModel* caller_object) {
-    //There exists more than one BrowseTableModel in Mixxx
-    //We only want to receive items here, this object has 'ordered' by the BrowserThread (singleton)
-    if(caller_object == this) {
+void BrowseTableModel::slotInsert(const QList< QList<QStandardItem*> >& rows,
+                                  BrowseTableModel* caller_object) {
+    // There exists more than one BrowseTableModel in Mixxx We only want to
+    // receive items here, this object has 'ordered' by the BrowserThread
+    // (singleton)
+    if (caller_object == this) {
         //qDebug() << "BrowseTableModel::slotInsert";
-        for(int i=0; i < rows.size(); ++i) {
+        for (int i = 0; i < rows.size(); ++i) {
             appendRow(rows.at(i));
         }
     }
-
 }
 
 TrackModel::CapabilitiesFlags BrowseTableModel::getCapabilities() const {
@@ -275,106 +274,108 @@
             | TRACKMODELCAPS_LOADTOSAMPLER;
 }
 
-Qt::ItemFlags BrowseTableModel::flags(const QModelIndex &index) const{
-
+Qt::ItemFlags BrowseTableModel::flags(const QModelIndex &index) const {
     Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
 
-    //Enable dragging songs from this data model to elsewhere (like the waveform
-    //widget to load a track into a Player).
+    // Enable dragging songs from this data model to elsewhere (like the
+    // waveform widget to load a track into a Player).
     defaultFlags |= Qt::ItemIsDragEnabled;
 
     QString track_location = getTrackLocation(index);
     int column = index.column();
 
-    if(isTrackInUse(track_location) ||
+    if (isTrackInUse(track_location) ||
        column == COLUMN_FILENAME ||
        column == COLUMN_BITRATE ||
        column == COLUMN_DURATION ||
        column == COLUMN_TYPE) {
         return defaultFlags;
-    }
-    else{
+    } else {
         return defaultFlags | Qt::ItemIsEditable;
     }
 }
 
-bool BrowseTableModel::isTrackInUse(QString &track_location) const
-{
-    int decks = ControlObject::getControl(ConfigKey("[Master]","num_decks"))->get();
-    //check if file is loaded to a deck
-    for(int i=1; i <= decks; ++i) {
-        TrackPointer loaded_track = PlayerInfo::Instance().getTrackInfo(QString("[Channel%1]").arg(i));
-        if(loaded_track && (loaded_track->getLocation() == track_location)) {
+bool BrowseTableModel::isTrackInUse(const QString &track_location) const {
+    int decks = ControlObject::getControl(
+        ConfigKey("[Master]", "num_decks"))->get();
+    // check if file is loaded to a deck
+    for (int i = 1; i <= decks; ++i) {
+        TrackPointer loaded_track = PlayerInfo::Instance().getTrackInfo(
+            QString("[Channel%1]").arg(i));
+        if (loaded_track && (loaded_track->getLocation() == track_location)) {
             return true;
         }
     }
 
-    if(m_pRecordingManager->getRecordingLocation() == track_location) {
+    if (m_pRecordingManager->getRecordingLocation() == track_location) {
         return true;
     }
 
     return false;
 }
 
-bool BrowseTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
+bool BrowseTableModel::setData(const QModelIndex &index, const QVariant &value,
+                               int role) {
     Q_UNUSED(role);
 
-   if(!index.isValid())
+    if (!index.isValid()) {
         return false;
+    }
     qDebug() << "BrowseTableModel::setData(" << index.data() << ")";
     int row = index.row();
     int col = index.column();
     QString track_location = getTrackLocation(index);
     AudioTagger tagger(track_location);
 
-    //set tagger information
-    tagger.setArtist(this->index(row,COLUMN_ARTIST).data().toString());
-    tagger.setTitle(this->index(row,COLUMN_TITLE).data().toString());
-    tagger.setAlbum(this->index(row,COLUMN_ALBUM).data().toString());
-    tagger.setKey(this->index(row,COLUMN_KEY).data().toString());
-    tagger.setBpm(this->index(row,COLUMN_BPM).data().toString());
-    tagger.setComment(this->index(row,COLUMN_COMMENT).data().toString());
-    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());
+    // set tagger information
+    tagger.setArtist(this->index(row, COLUMN_ARTIST).data().toString());
+    tagger.setTitle(this->index(row, COLUMN_TITLE).data().toString());
+    tagger.setAlbum(this->index(row, COLUMN_ALBUM).data().toString());
+    tagger.setKey(this->index(row, COLUMN_KEY).data().toString());
+    tagger.setBpm(this->index(row, COLUMN_BPM).data().toString());
+    tagger.setComment(this->index(row, COLUMN_COMMENT).data().toString());
+    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) {
+    // check if one the item were edited
+    if (col == COLUMN_ARTIST) {
         tagger.setArtist(value.toString());
-    } else if(col == COLUMN_TITLE) {
+    } else if (col == COLUMN_TITLE) {
         tagger.setTitle(value.toString());
-    } else if(col == COLUMN_ALBUM) {
+    } else if (col == COLUMN_ALBUM) {
         tagger.setAlbum(value.toString());
-    } else if(col == COLUMN_BPM) {
+    } else if (col == COLUMN_BPM) {
         tagger.setBpm(value.toString());
-    } else if(col == COLUMN_KEY) {
+    } else if (col == COLUMN_KEY) {
         tagger.setKey(value.toString());
-    } else if(col == COLUMN_TRACK_NUMBER) {
+    } else if (col == COLUMN_TRACK_NUMBER) {
         tagger.setTracknumber(value.toString());
-    } else if(col == COLUMN_COMMENT) {
+    } else if (col == COLUMN_COMMENT) {
         tagger.setComment(value.toString());
-    } else if(col == COLUMN_GENRE) {
+    } else if (col == COLUMN_GENRE) {
         tagger.setGenre(value.toString());
-    } else if(col == COLUMN_COMPOSER) {
+    } else if (col == COLUMN_COMPOSER) {
         tagger.setComposer(value.toString());
-    } else if(col == COLUMN_YEAR) {
+    } else if (col == COLUMN_YEAR) {
         tagger.setYear(value.toString());
     }
 
 
     QStandardItem* item = itemFromIndex(index);
-    if(tagger.save()) {
-        //Modify underlying interalPointer object
+    if (tagger.save()) {
+        // Modify underlying interalPointer object
         item->setText(value.toString());
         return true;
-    }
-    else {
-        //reset to old value in error
+    } else {
+        // reset to old value in error
         item->setText(index.data().toString());
-        QMessageBox::critical(0, tr("Mixxx Library"),tr("Could not update file metadata.")
-                              + "\n" +track_location);
+        QMessageBox::critical(
+            0, tr("Mixxx Library"),
+            tr("Could not update file metadata.")
+            + "\n" +track_location);
         return false;
     }
 }

=== modified file 'mixxx/src/library/browse/browsetablemodel.h'
--- mixxx/src/library/browse/browsetablemodel.h	2012-01-07 05:48:41 +0000
+++ mixxx/src/library/browse/browsetablemodel.h	2012-03-12 04:06:20 +0000
@@ -66,7 +66,7 @@
     void removeTracks(QStringList trackLocations);
 
     void addSearchColumn(int index);
-    bool isTrackInUse(QString& file) const;
+    bool isTrackInUse(const QString& file) const;
     QList<int> m_searchColumns;
     QString m_current_path;
     TrackCollection* m_pTrackCollection;

=== modified file 'mixxx/src/library/dao/cratedao.h'
--- mixxx/src/library/dao/cratedao.h	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/cratedao.h	2012-03-12 04:06:20 +0000
@@ -47,6 +47,8 @@
     void changed(int crateId);
     void trackAdded(int crateId, int trackId);
     void trackRemoved(int crateId, int trackId);
+    void renamed(int crateId);
+    void lockChanged(int crateId);
 
   private:
     QSqlDatabase& m_database;

=== modified file 'mixxx/src/widget/wtracktableview.cpp'
--- mixxx/src/widget/wtracktableview.cpp	2011-12-14 17:22:49 +0000
+++ mixxx/src/widget/wtracktableview.cpp	2012-03-12 04:06:20 +0000
@@ -82,6 +82,7 @@
 
     delete m_pReloadMetadataAct;
     delete m_pAutoDJAct;
+    delete m_pAutoDJTopAct;
     delete m_pRemoveAct;
     delete m_pPropertiesAct;
     delete m_pMenu;
@@ -241,7 +242,8 @@
 void WTrackTableView::disableSorting() {
     // We have to manually do this because setSortingEnabled(false) does not
     // properly disconnect the signals for some reason.
-    disconnect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)),
+    disconnect(horizontalHeader(),
+               SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)),
                this, SLOT(doSortByColumn(int)));
     horizontalHeader()->setSortIndicatorShown(false);
 }
@@ -250,17 +252,23 @@
     Q_ASSERT(m_pMenu);
     Q_ASSERT(m_pSamplerMenu);
 
-    m_pRemoveAct = new QAction(tr("Remove"),this);
+    m_pRemoveAct = new QAction(tr("Remove"), this);
     connect(m_pRemoveAct, SIGNAL(triggered()), this, SLOT(slotRemove()));
 
     m_pPropertiesAct = new QAction(tr("Properties..."), this);
-    connect(m_pPropertiesAct, SIGNAL(triggered()), this, SLOT(slotShowTrackInfo()));
+    connect(m_pPropertiesAct, SIGNAL(triggered()),
+            this, SLOT(slotShowTrackInfo()));
 
-    m_pAutoDJAct = new QAction(tr("Add to Auto DJ Queue"),this);
+    m_pAutoDJAct = new QAction(tr("Add to Auto-DJ Queue (bottom)"), this);
     connect(m_pAutoDJAct, SIGNAL(triggered()), this, SLOT(slotSendToAutoDJ()));
 
+    m_pAutoDJTopAct = new QAction(tr("Add to Auto-DJ Queue (top)"), this);
+    connect(m_pAutoDJTopAct, SIGNAL(triggered()),
+            this, SLOT(slotSendToAutoDJTop()));
+
     m_pReloadMetadataAct = new QAction(tr("Reload Track Metadata"), this);
-    connect(m_pReloadMetadataAct, SIGNAL(triggered()), this, SLOT(slotReloadTrackMetadata()));
+    connect(m_pReloadMetadataAct, SIGNAL(triggered()),
+            this, SLOT(slotReloadTrackMetadata()));
 }
 
 void WTrackTableView::slotMouseDoubleClicked(const QModelIndex &index) {
@@ -345,8 +353,7 @@
     m_pTrackInfo->show();
 }
 
-void WTrackTableView::contextMenuEvent(QContextMenuEvent * event)
-{
+void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
     QModelIndexList indices = selectionModel()->selectedRows();
 
     // Gray out some stuff if multiple songs were selected.
@@ -356,6 +363,7 @@
 
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) {
         m_pMenu->addAction(m_pAutoDJAct);
+        m_pMenu->addAction(m_pAutoDJTopAct);
         m_pMenu->addSeparator();
     }
 
@@ -800,6 +808,15 @@
 }
 
 void WTrackTableView::slotSendToAutoDJ() {
+    // append to auto DJ
+    sendToAutoDJ(false);  // bTop = false
+}
+
+void WTrackTableView::slotSendToAutoDJTop() {
+    sendToAutoDJ(true);  // bTop = true
+}
+
+void WTrackTableView::sendToAutoDJ(bool bTop) {
     if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) {
         return;
     }
@@ -819,7 +836,15 @@
             (pTrack = trackModel->getTrack(index))) {
             int iTrackId = pTrack->getId();
             if (iTrackId != -1) {
-                playlistDao.appendTrackToPlaylist(iTrackId, iAutoDJPlaylistId);
+                if (bTop) {
+                    // Load track to position two because position one is
+                    // already loaded to the player
+                    playlistDao.insertTrackIntoPlaylist(iTrackId,
+                                                        iAutoDJPlaylistId, 2);
+                } else {
+                    playlistDao.appendTrackToPlaylist(
+                        iTrackId, iAutoDJPlaylistId);
+                }
             }
         }
     }

=== modified file 'mixxx/src/widget/wtracktableview.h'
--- mixxx/src/widget/wtracktableview.h	2011-10-14 03:58:14 +0000
+++ mixxx/src/widget/wtracktableview.h	2012-03-12 04:06:20 +0000
@@ -19,10 +19,9 @@
 const QString LIBRARY_CONFIGVALUE = "[Library]"; /** ConfigValue "value" (wtf) for library stuff */
 
 
-class WTrackTableView : public WLibraryTableView
-{
+class WTrackTableView : public WLibraryTableView {
     Q_OBJECT
- 	public:
+  public:
     WTrackTableView(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
                     TrackCollection* pTrackCollection);
     virtual ~WTrackTableView();
@@ -46,6 +45,7 @@
     void slotNextTrackInfo();
     void slotPrevTrackInfo();
     void slotSendToAutoDJ();
+    void slotSendToAutoDJTop();
     void slotReloadTrackMetadata();
     void addSelectionToPlaylist(int iPlaylistId);
     void addSelectionToCrate(int iCrateId);
@@ -53,6 +53,7 @@
     void doSortByColumn(int headerSection);
 
   private:
+    void sendToAutoDJ(bool bTop);
     void showTrackInfo(QModelIndex index);
     void createActions();
     void dragMoveEvent(QDragMoveEvent * event);
@@ -89,6 +90,7 @@
 
     // Send to Auto-DJ Action
     QAction *m_pAutoDJAct;
+    QAction *m_pAutoDJTopAct;
 
     // Remove from table
     QAction *m_pRemoveAct;