Merge lp:~oberling/mixxx/feature_first-beat-in-bar into lp:~mixxxdevelopers/mixxx/trunk

[Stephan Bergemann]

Added a highlight on every first beat in a bar.

Added a highlight on every first beat in a bar.
This fixes one part of bug #753301 as it gives a usefull visual indicator for mixing tracks.
I also added a color for this highlighted beat to each existing theme.

[lp:~oberling/mixxx/feature_first-beat-in-bar]

3337. By Stephan Bergemann <email address hidden> on 2013-03-23

fixed firstBeatInBar-Calculation in BeatMap

[Daniel Schürmann (daschuer)]

Hi Stephan,

Thank you very much for your branch.
From the coding side it looks good.
Except expression in mixxx/src/waveform/renderers/waveformrenderbeat.cpp line 110 should be combined with the expressions above.

Form the visual point of view IMHO the first beat bar is too highlighted (too red and bold). I would prefer an additional icon on the normal bars. I hope Jus, our design maintainer can also help out here.

While this is a good step to the final goal, I would not merge this branch yet because of the missing detection support.

Kind regards,
Daniel

review: Needs Fixing

[lp:~oberling/mixxx/feature_first-beat-in-bar]

3338. By Stephan Bergemann <email address hidden> on 2013-03-24

made first beat bar less bold; added a little efficiency;

[Stephan Bergemann (oberling)]

Hi Daniel,

thanks a lot for the review and kind advices.

I made the first beat bar a little less thick and integrated my if-clause with the existing ones. As i'm no designer i just chose the colors that fitted the most for me - may Jus feel free to change them all :-) .

I just don't get what you mean by "missing detection support". The missing phase-sync from the cited bug report was already implemented before my branch. At least one can click on sync and when not in vinyl control mode it should sync the bpm as well as the phase to the nearest detected beat. However it does not sync to the first beat of a bar - that's right. Was that what you meant?

Kind regards,
Stephan

[Daniel Schürmann (daschuer)]

Hi Stephan,

thank you again. IMHO it looks fine now.

Please don’t kill me if the following paragraphs are totally rubbish :-) ...

I am not an expert in music theory but for a lot of my tracks it feels to me that the new downbeat makers are simply placed at the wrong position.

I have just read:
http://en.wikipedia.org/wiki/Beat_%28music%29
http://en.wikipedia.org/wiki/Bar_%28music%29

As far as I understand (please correct me) a downbeat marker should be placed at least at theme changes or when a chorus starts. Maybe there is an unwritten law that the first beat in a track is always a downbeat like assumed in your patch, but for some of the tracks in my collection this is true but not for the rest.

I cannot evaluate how useful you patch is in the current state. Is the four beat assumption true in general? Do we need a facility to correct the first beat in a bar and the number of beats per bar?

I hope we can answer these questions soon.

Kind regards,

Daniel

review: Abstain

[Stephan Bergemann (oberling)]

Hi Daniel,

sorry for that taking so long - lots of other stuff to do first.
I thought for some time about your suggestions:
I totally agree with you, that it would be nice to have the "first beat in a bar" adjustable. At the moment it's just the first ever stroke in the grid corresponding to the audio file (which doesn't have to be the first beat of the track - however it (at least for my tracks) is in 90% ;-) ).
The first beat in a bar in my understanding (and if i understood correctly also in your understanding) describes the downbeat (thats also the definition of Downbeat in the wikipedia article "Beat_(music)").

There are a few steps i could try to implement from that point:
* add a "first_downbeat" to the stored track informations
* store the first beat really on a beat (and not the first ever grid-element in the audio file) - that would be quiet hard to distinguish i guess (silent intros and stuff)
* bloat the beat detection to be really highly sophisticated and also detect bars, intros outtros, repeated parts and stuff - that would involve detecting where bars start and end and also a the writing of a PhD thesis :-D

All those changes would however that would (as far as i see) result in the need of a recreateion of the database and i don't know if that would raise my chances of getting this branch merged ;-) .
That's the main reason why i didn't do it that way in the first place.

As of the four beat assumption: this is adjustable but defaults to 4 (see the Constructors of the BeatGridIterator and BeatMapIterator) in the current state of development to give an idea.
When extending this idea we would have to think about storing this information as well in the Trackinformation.
And... in general (although i can not remember having seen that in other DJ Software) all the beat detection is voulnerable to time changes.

Kind regards,
Stephan

> Hi Stephan,
>
> thank you again. IMHO it looks fine now.
>
> Please don’t kill me if the following paragraphs are totally rubbish :-) ...
>
> I am not an expert in music theory but for a lot of my tracks it feels to me
> that the new downbeat makers are simply placed at the wrong position.
>
> I have just read:
> http://en.wikipedia.org/wiki/Beat_%28music%29
> http://en.wikipedia.org/wiki/Bar_%28music%29
>
> As far as I understand (please correct me) a downbeat marker should be placed
> at least at theme changes or when a chorus starts. Maybe there is an unwritten
> law that the first beat in a track is always a downbeat like assumed in your
> patch, but for some of the tracks in my collection this is true but not for
> the rest.
>
> I cannot evaluate how useful you patch is in the current state. Is the four
> beat assumption true in general? Do we need a facility to correct the first
> beat in a bar and the number of beats per bar?
>
> I hope we can answer these questions soon.
>
> Kind regards,
>
> Daniel

[Daniel Schürmann (daschuer)]

Hi Stephan,

first of all: I am sure your branch will get merged.

I personaly not like informaton that "might" be right. So the bars schould not be displayed by default if they are not valid. But you might introduce a waveform preference to enable them.

An other option is to introduce a new Cue point type "first bar". The database schma already supports different cue point types. lp:~smstewart91/mixxx/advanced_autodj makes use of it. I think it is common for many DJs to place the normal cue point at this place so you might deal with it.
We could probably adjust it by rightclick to the "Adjust Beatgrid" button.

The third option is to activate the bar detection which already lives in the mixxx source. mixxx/vamp-plugins/plugins/BarBeatTrack.cpp I dont know the current state but maybe Vittorio or RJ might help here.

Kind regards

Daniel

Unmerged revisions

3338. By Stephan Bergemann <email address hidden> on 2013-03-24

made first beat bar less bold; added a little efficiency;

3337. By Stephan Bergemann <email address hidden> on 2013-03-23

fixed firstBeatInBar-Calculation in BeatMap

3336. By Stephan Bergemann <email address hidden> on 2013-03-23

added new colour to every theme

3335. By Stephan Bergemann <email address hidden> on 2013-03-22

added red highlight for first beat of each bar

=== modified file 'mixxx/res/skins/Deere1280x1024-SXGA/skin.xml'
--- mixxx/res/skins/Deere1280x1024-SXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1280x1024-SXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -3958,6 +3958,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -5057,6 +5058,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Deere1280x800-WXGA/skin.xml'
--- mixxx/res/skins/Deere1280x800-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1280x800-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -3958,6 +3958,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -5057,6 +5058,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Deere1366x768-WXGA/skin.xml'
--- mixxx/res/skins/Deere1366x768-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1366x768-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -3958,6 +3958,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -5057,6 +5058,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Deere1440x900-WXGA+/skin.xml'
--- mixxx/res/skins/Deere1440x900-WXGA+/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1440x900-WXGA+/skin.xml	2013-03-24 00:04:23 +0000
@@ -3958,6 +3958,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -5057,6 +5058,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Deere1920x1080-FullHD/skin.xml'
--- mixxx/res/skins/Deere1920x1080-FullHD/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1920x1080-FullHD/skin.xml	2013-03-24 00:04:23 +0000
@@ -4986,6 +4986,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -6085,6 +6086,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Deere1920x1200-WUXGA/skin.xml'
--- mixxx/res/skins/Deere1920x1200-WUXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/Deere1920x1200-WUXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -4986,6 +4986,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -6085,6 +6086,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/DeereSamplegrid1280x800-WXGA/skin.xml'
--- mixxx/res/skins/DeereSamplegrid1280x800-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/DeereSamplegrid1280x800-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -5622,6 +5622,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<MarkerColor>#00FF00</MarkerColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
@@ -6723,6 +6724,7 @@
 						<SignalLowColor></SignalLowColor>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<MarkerColor>#00FF00</MarkerColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 
=== modified file 'mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml'
--- mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/LateNight1280x800-WXGA/skin.xml'
--- mixxx/res/skins/LateNight1280x800-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNight1280x800-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/LateNight1366x768-WXGA/skin.xml'
--- mixxx/res/skins/LateNight1366x768-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNight1366x768-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#0099FF</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#E17800</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml'
--- mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#FBC400</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#FB9A00</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml'
--- mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#FBC400</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#FB9A00</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/LateNightBlues1366x768-WXGA/skin.xml'
--- mixxx/res/skins/LateNightBlues1366x768-WXGA/skin.xml	2013-02-16 15:03:32 +0000
+++ mixxx/res/skins/LateNightBlues1366x768-WXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -2817,6 +2817,7 @@
 						<BgPixmap>style/style_bg_waveform1.png</BgPixmap>
 						<SignalColor>#FBC400</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -2871,6 +2872,7 @@
 						<BgPixmap>style/style_bg_waveform2.png</BgPixmap>
 						<SignalColor>#FB9A00</SignalColor>
 						<BeatColor>#ffffff</BeatColor>
+						<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/skin.xml'
--- mixxx/res/skins/Outline1024x600-Netbook/skin.xml	2013-02-01 17:26:08 +0000
+++ mixxx/res/skins/Outline1024x600-Netbook/skin.xml	2013-03-24 00:04:23 +0000
@@ -616,6 +616,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#19ABFB</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
@@ -674,6 +675,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#FF0000</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
 
=== modified file 'mixxx/res/skins/Outline1024x768-XGA/skin.xml'
--- mixxx/res/skins/Outline1024x768-XGA/skin.xml	2013-02-01 17:26:08 +0000
+++ mixxx/res/skins/Outline1024x768-XGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -616,6 +616,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#19ABFB</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
@@ -674,6 +675,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#FF0000</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
 
=== modified file 'mixxx/res/skins/Outline800x480-WVGA/skin.xml'
--- mixxx/res/skins/Outline800x480-WVGA/skin.xml	2013-02-01 17:26:52 +0000
+++ mixxx/res/skins/Outline800x480-WVGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -616,6 +616,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#19ABFB</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
@@ -674,6 +675,7 @@
 						<SignalLowColor>#FF0035</SignalLowColor>
 						<SignalColor>#FF0000</SignalColor>
 						<BeatColor>#191919</BeatColor>
+						<FirstBeatInBarColor>#000000</FirstBeatInBarColor>
 						<BeatHighlightColor></BeatHighlightColor>
 						<PlayPosColor>#00FF00</PlayPosColor>
 						<Align></Align>
 
=== modified file 'mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml'
--- mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml	2013-01-31 19:48:57 +0000
+++ mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -210,6 +210,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#0080FF</SignalColor>
 		<BeatColor>#454C53</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#FD0564</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -267,6 +268,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#E17000</SignalColor>
 		<BeatColor>#454C53</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#FD0564</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml'
--- mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml	2013-01-31 19:48:57 +0000
+++ mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -210,6 +210,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#0080FF</SignalColor>
 		<BeatColor>#454C53</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#FD0564</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -267,6 +268,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#E17000</SignalColor>
 		<BeatColor>#454C53</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#FD0564</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml'
--- mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml	2013-01-31 19:48:57 +0000
+++ mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -209,6 +209,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#0099FF</SignalColor>
 		<BeatColor>#CCCCCC</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#00FF00</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -266,6 +267,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#CC6600</SignalColor>
 		<BeatColor>#CCCCCC</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#00FF00</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml'
--- mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml	2013-01-31 19:48:57 +0000
+++ mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -209,6 +209,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#0099FF</SignalColor>
 		<BeatColor>#CCCCCC</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#00FF00</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -266,6 +267,7 @@
 		<SignalLowColor></SignalLowColor>
 		<SignalColor>#CC6600</SignalColor>
 		<BeatColor>#CCCCCC</BeatColor>
+		<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 		<BeatHighlightColor></BeatHighlightColor>
 		<PlayPosColor>#00FF00</PlayPosColor>
 		<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Shade1024x600-Netbook/skin.xml'
--- mixxx/res/skins/Shade1024x600-Netbook/skin.xml	2013-03-15 14:15:30 +0000
+++ mixxx/res/skins/Shade1024x600-Netbook/skin.xml	2013-03-24 00:04:23 +0000
@@ -3386,6 +3386,7 @@
 								<SignalLowColor></SignalLowColor>
 								<SignalColor>#191F24</SignalColor>
 								<BeatColor>#FFFFFF</BeatColor>
+								<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -4730,6 +4731,7 @@
 								<SignalLowColor></SignalLowColor>
 								<SignalColor>#191F24</SignalColor>
 								<BeatColor>#FFFFFF</BeatColor>
+								<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/Shade1024x768-XGA/skin.xml'
--- mixxx/res/skins/Shade1024x768-XGA/skin.xml	2013-03-15 14:15:30 +0000
+++ mixxx/res/skins/Shade1024x768-XGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -3386,6 +3386,7 @@
 								<SignalLowColor></SignalLowColor>
 								<SignalColor>#191F24</SignalColor>
 								<BeatColor>#FFFFFF</BeatColor>
+								<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -4730,6 +4731,7 @@
 								<SignalLowColor></SignalLowColor>
 								<SignalColor>#191F24</SignalColor>
 								<BeatColor>#FFFFFF</BeatColor>
+								<FirstBeatInBarColor>#bc0a0a</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml'
--- mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml	2013-03-15 14:15:30 +0000
+++ mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml	2013-03-24 00:04:23 +0000
@@ -3386,6 +3386,7 @@
 								<SignalLowColor>#FF0035</SignalLowColor>
 								<SignalColor>#FF8000</SignalColor>
 								<BeatColor>#E4E4E4</BeatColor>
+								<FirstBeatInBarColor>#fefefe</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -4730,6 +4731,7 @@
 								<SignalLowColor>#FF0035</SignalLowColor>
 								<SignalColor>#FF8000</SignalColor>
 								<BeatColor>#E4E4E4</BeatColor>
+								<FirstBeatInBarColor>#fefefe</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml'
--- mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml	2013-03-15 14:15:30 +0000
+++ mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml	2013-03-24 00:04:23 +0000
@@ -3386,6 +3386,7 @@
 								<SignalLowColor>#FF0035</SignalLowColor>
 								<SignalColor>#FF8000</SignalColor>
 								<BeatColor>#E4E4E4</BeatColor>
+								<FirstBeatInBarColor>#fefefe</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
@@ -4730,6 +4731,7 @@
 								<SignalLowColor>#FF0035</SignalLowColor>
 								<SignalColor>#FF8000</SignalColor>
 								<BeatColor>#E4E4E4</BeatColor>
+								<FirstBeatInBarColor>#fefefe</FirstBeatInBarColor>
 								<BeatHighlightColor></BeatHighlightColor>
 								<PlayPosColor>#00FF00</PlayPosColor>
 								<EndOfTrackColor>#EA0000</EndOfTrackColor>
 
=== modified file 'mixxx/src/track/beatgrid.cpp'
--- mixxx/src/track/beatgrid.cpp	2012-11-20 00:40:18 +0000
+++ mixxx/src/track/beatgrid.cpp	2013-03-24 00:04:23 +0000
@@ -7,16 +7,19 @@
 static const int kFrameSize = 2;
 
 struct BeatGridData {
-	double bpm;
-	double firstBeat;
+    double bpm;
+    double firstBeat;
+    int beatsPerBar;
 };
 
 class BeatGridIterator : public BeatIterator {
   public:
-    BeatGridIterator(double dBeatLength, double dFirstBeat, double dEndSample)
+    BeatGridIterator(double dBeatLength, double dFirstBeat, double dEndSample, double dGlobalFirstBeat, int dBeatsPerBar = 4)
             : m_dBeatLength(dBeatLength),
               m_dCurrentSample(dFirstBeat),
-              m_dEndSample(dEndSample) {
+              m_dEndSample(dEndSample),
+              m_dFirstBeat(dGlobalFirstBeat),
+              m_dBeatsPerBar(dBeatsPerBar) {
     }
 
     virtual bool hasNext() const {
@@ -29,10 +32,18 @@
         return beat;
     }
 
+    virtual bool isFirstInBar() const {
+		if(m_dCurrentSample >= m_dFirstBeat)
+	        return (((int)(((m_dCurrentSample - m_dFirstBeat) / m_dBeatLength)+.5)-1) % m_dBeatsPerBar) == 0;
+		return false;
+    }
+
   private:
     double m_dBeatLength;
     double m_dCurrentSample;
     double m_dEndSample;
+    double m_dFirstBeat;
+    int m_dBeatsPerBar;
 };
 
 BeatGrid::BeatGrid(TrackInfoObject* pTrack, const QByteArray* pByteArray)
@@ -188,7 +199,8 @@
     if (curBeat == -1.0) {
         return NULL;
     }
-    return new BeatGridIterator(m_dBeatLength, curBeat, stopSample);
+    double firstBeat = findNextBeat(0);
+    return new BeatGridIterator(m_dBeatLength, curBeat, stopSample, firstBeat);
 }
 
 bool BeatGrid::hasBeatInRange(double startSample, double stopSample) const {
 
=== modified file 'mixxx/src/track/beatmap.cpp'
--- mixxx/src/track/beatmap.cpp	2012-05-07 05:30:14 +0000
+++ mixxx/src/track/beatmap.cpp	2013-03-24 00:04:23 +0000
@@ -29,9 +29,11 @@
 
 class BeatMapIterator : public BeatIterator {
   public:
-    BeatMapIterator(BeatList::const_iterator start, BeatList::const_iterator end)
+    BeatMapIterator(BeatList::const_iterator start, BeatList::const_iterator end, BeatList::const_iterator first, int beatsPerBar = 4)
             : m_currentBeat(start),
-              m_endBeat(end) {
+              m_endBeat(end),
+              m_firstBeat(first),
+              m_beatsPerBar(beatsPerBar) {
         // Advance to the first enabled beat.
         while (m_currentBeat != m_endBeat && !m_currentBeat->enabled()) {
             m_currentBeat++;
@@ -51,9 +53,15 @@
         return beat;
     }
 
+    virtual bool isFirstInBar() const {
+        return (m_currentBeat - m_firstBeat) % m_beatsPerBar == 0;
+    }
+
   private:
     BeatList::const_iterator m_currentBeat;
     BeatList::const_iterator m_endBeat;
+    BeatList::const_iterator m_firstBeat;;
+    int m_beatsPerBar;
 };
 
 BeatMap::BeatMap(TrackPointer pTrack, const QByteArray* pByteArray)
@@ -248,7 +256,7 @@
     if (curBeat >= lastBeat) {
         return NULL;
     }
-    return new BeatMapIterator(curBeat, lastBeat);
+    return new BeatMapIterator(curBeat, lastBeat, m_beats.begin());
 }
 
 bool BeatMap::hasBeatInRange(double startSample, double stopSample) const {
 
=== modified file 'mixxx/src/track/beats.h'
--- mixxx/src/track/beats.h	2013-01-19 12:15:22 +0000
+++ mixxx/src/track/beats.h	2013-03-24 00:04:23 +0000
@@ -14,6 +14,7 @@
     virtual ~BeatIterator() {}
     virtual bool hasNext() const = 0;
     virtual double next() = 0;
+    virtual bool isFirstInBar() const = 0;
 };
 
 // Beats is a pure abstract base class for BPM and beat management classes. It
 
=== modified file 'mixxx/src/waveform/renderers/waveformrenderbeat.cpp'
--- mixxx/src/waveform/renderers/waveformrenderbeat.cpp	2012-12-10 02:44:06 +0000
+++ mixxx/src/waveform/renderers/waveformrenderbeat.cpp	2013-03-24 00:04:23 +0000
@@ -39,6 +39,14 @@
     }
     m_highBeatColor = WSkinColor::getCorrectColor(m_highBeatColor);
 
+    m_firstBeatInBarColor = Qt::red;
+    QString firstInBar = WWidget::selectNodeQString(node, "FirstBeatInBarColor");
+    if (firstInBar != "") {
+        m_firstBeatInBarColor.setNamedColor(firstInBar);
+    }
+    m_firstBeatInBarColor = WSkinColor::getCorrectColor(m_firstBeatInBarColor);
+
+
     if (m_beatColor.alphaF() > 0.99)
         m_beatColor.setAlphaF(0.8);
 
@@ -55,6 +63,7 @@
     BeatsPointer trackBeats = trackInfo->getBeats();
     if (!trackBeats)
         return;
+    double firstBeatOfTrack = trackBeats->findNextBeat(0);
 
     const int trackSamples = m_waveformRenderer->getTrackSamples();
     if (trackSamples <= 0) {
@@ -83,19 +92,25 @@
     beatPen.setWidth(1.5);
     QPen highBeatPen(m_highBeatColor);
     highBeatPen.setWidth(1.5);
+    QPen firstBeatInBarPen(m_firstBeatInBarColor);
+    firstBeatInBarPen.setWidth(2.5);
 
     while (it->hasNext()) {
         int beatPosition = it->next();
         m_waveformRenderer->regulateVisualSample(beatPosition);
         double xBeatPoint = m_waveformRenderer->transformSampleIndexInRendererWorld(beatPosition);
 
+        if (it->isFirstInBar()) {
+            painter->setPen(firstBeatInBarPen);
+        }
         //NOTE: (vRince) RJ should we keep this ?
-        if (m_beatActive && m_beatActive->get() > 0.0 &&
-            abs(xBeatPoint - m_waveformRenderer->getWidth()/2) < 20)
+        else if (m_beatActive && m_beatActive->get() > 0.0 &&
+            abs(xBeatPoint - m_waveformRenderer->getWidth()/2) < 20) {
             painter->setPen(highBeatPen);
-        else
+        } else {
             painter->setPen(beatPen);
-
+        }
+        
         painter->drawLine(QPointF(xBeatPoint, 0.f),
                           QPointF(xBeatPoint,
                                   (float)m_waveformRenderer->getHeight()));
 
=== modified file 'mixxx/src/waveform/renderers/waveformrenderbeat.h'
--- mixxx/src/waveform/renderers/waveformrenderbeat.h	2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/waveformrenderbeat.h	2013-03-24 00:04:23 +0000
@@ -20,6 +20,7 @@
   private:
     QColor m_beatColor;
     QColor m_highBeatColor;
+    QColor m_firstBeatInBarColor;
     ControlObjectThreadMain* m_beatActive;
 
     DISALLOW_COPY_AND_ASSIGN(WaveformRenderBeat);