vor änderung player 2

3 files changed, 63 insertions, 72 deletions

diff --git a/RHMixxx1280x800/background1280x1024.xcf b/RHMixxx1280x800/background1280x1024.xcf
index 9d872b0..0fa7658 100644
--- a/RHMixxx1280x800/background1280x1024.xcf
+++ b/RHMixxx1280x800/background1280x1024.xcf
diff --git a/RHMixxx1280x800/notes b/RHMixxx1280x800/notes
index 3638858..45a29c9 100644
--- a/RHMixxx1280x800/notes
+++ b/RHMixxx1280x800/notes
@@ -7,13 +7,9 @@ sampler: buttons: breite 46
 
 http://mixxx.org/wiki/doku.php/creating_skins
 http://www.mixxx.org/wiki/doku.php/mixxxcontrols
+http://www.mixxx.org/manual/latest/chapters/appendix.html
 
-AutoDJ
-------
 
-in /src/basetrackplayer.cpp
-bPlay bei Aufruf durch Auto DJ null setzen?
-void BaseTrackPlayer::slotLoadTrack(TrackPointer track, bool bPlay) {
 
 Wichtig:
 --------
@@ -66,6 +62,7 @@ Tasten Matrix (16 Pins am Controller sollten reichen)
 Player rot und Blau, kohnstantes leutchten, bei Play Play Taste, bei Pause beide (Play Stop)
 Sampler leuchten permanent, wenn sie spielen blinken sie. Play und stopp eine Taste
 zwecks sampler Automatisch neu starten, mit beschränkung?? oder icon mit script inkl. optionen
+Eventuell Datei, wo die files drinnen stehen, die beim start aufgerufen wird
 
 Auto DJ ist Zustand
 -------------------
@@ -91,6 +88,10 @@ http://www.mixxx.org/wiki/doku.php/gsoc2012_autodj_features
      - Vielversprehcend:
        http://blog.christian-hufgard.de/mixxx_midiscripting_made_easier_update-2013-05-23 
 
+     - in /src/basetrackplayer.cpp
+       bPlay bei Aufruf durch Auto DJ null setzen?
+       void BaseTrackPlayer::slotLoadTrack(TrackPointer track, bool bPlay) {
+
 Airtime
 -------
 
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 41c7433..7a9e9c1 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -265,7 +265,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Style>
 				<Channel>1</Channel>
 				<Pos>0,1</Pos>
-				<Size>381,50</Size>
+				<Size>331,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -316,7 +316,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>1</Channel>
 				<Pos>0,60</Pos>
-				<Size>320,40</Size>
+				<Size>260,40</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
 				<SignalColor>#CC0000</SignalColor>
@@ -344,7 +344,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_play_over.png</Pressed>
 					<Unpressed>btn_play_over.png</Unpressed>
 				</State>
-				<Pos>388,0</Pos>
+				<Pos>338,0</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
@@ -374,7 +374,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_repeat1_over.png</Pressed>
 					<Unpressed>btn_repeat1_over.png</Unpressed>
 				</State>
-				<Pos>250,60</Pos>
+				<Pos>210,60</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],repeat</ConfigKey>
 				</Connection>
@@ -390,7 +390,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_stop_red.png</Pressed>
 					<Unpressed>btn_stop.png</Unpressed>
 				</State>
-				<Pos>335,60</Pos>
+				<Pos>295,60</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -401,7 +401,53 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
-			</PushButton>		
+			</PushButton>
+			
+		    <!--VU-Meter Players-->
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>440,27</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel1],VuMeterL</ConfigKey>
+				</Connection>
+			</VuMeter>
+			
+			<StatusLight>
+				<Tooltip>Peak Indicator&#10;Indicates when the signal on the channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
+				<Style></Style>
+				<PathStatusLight>btn_clipping_master_over.png</PathStatusLight>
+				<PathBack>btn_clipping_master.png</PathBack>
+				<Pos>440,10</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
+				</Connection>
+			</StatusLight>
+			
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the right channel (1) volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>454,27</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
+				</Connection>
+			</VuMeter>
 	    </Children>
     </WidgetGroup>
 
@@ -422,16 +468,16 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Size>381,50</Size>
 		        <BgColor>#ffffff</BgColor>
 		        <HfcColor>#000000</HfcColor>
-		        <SignalColor>#CC0000</SignalColor>       
-				<SignalLowColor>#CC0000</SignalLowColor>
-				<SignalMidColor>#CC0000</SignalMidColor>
+		        <SignalColor>#000000</SignalColor>       
+				<SignalLowColor>#000000</SignalLowColor>
+				<SignalMidColor>#000000</SignalMidColor>
 				<SignalHighColor>#ff8900</SignalHighColor>
 		        <BeatColor>#e0ddd7</BeatColor>
 		        <BeatHighlightColor>#00FF00</BeatHighlightColor>
 		        <MarkerColor>#00FF00</MarkerColor>
 		        <CueColor>#e19820</CueColor>
 		        <PlayPosColor>#00FF00</PlayPosColor>
-		        <Mark>
+		        <Mark>	
 					<Control>cue_point</Control>
 					<Pixmap>marker_cue.png</Pixmap>
 					<Text> CUE </Text>
@@ -471,7 +517,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Pos>0,60</Pos>
 				<Size>320,40</Size>
 				<BgColor>#FFFFFF</BgColor>
-				<SignalColor>#CC0000</SignalColor>
+				<SignalColor>#000000</SignalColor>
 				<PlayPosColor>#00FF00</PlayPosColor>
 				<Connection>
 					<ConfigKey>[Channel2],playposition</ConfigKey>
@@ -545,62 +591,6 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 		<Pos>520,114</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
-
-			<!-- CHANNEL 1 -->
-			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
-				<Style></Style>
-				<PathVu>btn_volume_display_small_over.png</PathVu>
-				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>14,24</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel1],VuMeterL</ConfigKey>
-				</Connection>
-			</VuMeter>
-			
-			<StatusLight>
-				<Tooltip>Peak Indicator&#10;Indicates when the signal on the channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
-				<Style></Style>
-				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
-				<PathBack>btn_clipping.png</PathBack>
-				<Pos>14,24</Pos>
-				<Connection>
-					<ConfigKey>[Channel1],PeakIndicatorL</ConfigKey>
-				</Connection>
-			</StatusLight>
-			
-			
-			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the right channel (1) volume&#10;</Tooltip>
-				<Style></Style>
-				<PathVu>btn_volume_display_small_over.png</PathVu>
-				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>40,24</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
-				</Connection>
-			</VuMeter>
-			
-			<StatusLight>
-				<Tooltip>Peak Indicator&#10;Indicates when the signal on the right channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
-				<Style></Style>
-				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
-				<PathBack>btn_clipping.png</PathBack>
-				<Pos>40,24</Pos>
-				<Connection>
-					<ConfigKey>[Channel1],PeakIndicatorR</ConfigKey>
-				</Connection>
-			</StatusLight>
 						<!-- CHANNEL 2 -->
 			<VuMeter>
 				<Tooltip>Channel volume meter&#10;Shows the left channel (2) volume&#10;</Tooltip>