2 Sampler

1 files changed, 227 insertions, 36 deletions

diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index ae39e62..08236d4 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -57,10 +57,10 @@
 		<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 		<attributes>
 			<attribute config_key="[Master],num_decks">2</attribute>
-			<attribute config_key="[Master],num_samplers">2</attribute>
+			<attribute config_key="[Master],num_samplers">10</attribute>
 			<attribute config_key="[Master],num_preview_decks">0</attribute>
 			<attribute config_key="[PreviewDeck],show_previewdeck">0</attribute>
-            <attribute config_key="[Samplers],show_samplers">1</attribute>
+            <attribute config_key="[Samplers],show_samplers">10</attribute>
 		</attributes>
 	</manifest>
 
@@ -891,6 +891,7 @@
 	Visual - Volume level display
 	**********************************************
 	-->
+	
 	<WidgetGroup>
 		<Pos>520,114</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
@@ -923,7 +924,41 @@
 				</Connection>
 			</StatusLight>
 			
+						<!-- CHANNEL 2 -->
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the right channel (2) volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>204,34</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel2],VuMeter</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>204,34</Pos>
+				<Connection>
+					<ConfigKey>[Channel2],PeakIndicator</ConfigKey>
+				</Connection>
+			</StatusLight>
+		</Children>
+	</WidgetGroup>
+			
+			
+	<WidgetGroup>
+		<Pos>1000,700</Pos>
+		<Style>QGroupBox { border: 0px solid red; }</Style>			
+        <Children>
 			<!-- MASTER CHANNEL -->
 			<VuMeter>
 				<Tooltip>Master channel volume meter&#10;Shows the current master volume for the left channel.&#10;</Tooltip>
@@ -944,7 +979,7 @@
 				<Style></Style>
 				<PathVu>btn_volume_display_over.png</PathVu>
 				<PathBack>btn_volume_display.png</PathBack>
-				<Pos>122,0</Pos>
+				<Pos>130,0</Pos>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
 				<PeakFallTime>50</PeakFallTime>
@@ -964,33 +999,7 @@
 				</Connection>
 			</StatusLight>
 
-			<!-- CHANNEL 2 -->
-			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the right channel (2) volume&#10;</Tooltip>
-				<Style></Style>
-				<PathVu>btn_volume_display_small_over.png</PathVu>
-				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>204,34</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel2],VuMeter</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>204,34</Pos>
-				<Connection>
-					<ConfigKey>[Channel2],PeakIndicator</ConfigKey>
-				</Connection>
-			</StatusLight>
 
 		</Children>
 	</WidgetGroup>
@@ -1014,26 +1023,26 @@
 Sampler
 ***********************************************************
 -->
-<!--
+
 	<WidgetGroup>
 		<Pos>20,660</Pos>
-		<Size>1240,100</Size>
+		<Size>1240,500</Size>
 		<Layout>horizontal</Layout>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
--->
+
 
 			<!-- Sampler Bank sub-widget -->
 			<WidgetGroup>
-                                <Pos>0,680</Pos>
-				<Size>300,222</Size>
-				<Layout>vertikal</Layout>
+                <Pos>0,0</Pos>
+				<Size>1000,500</Size>
+				<Layout>horizontal</Layout>
 				<Style>QGroupBox { border: 0px solid yellow; margin: 0px 0px 4px 0px;} </Style>
 				<Children>
 					<!-- all sub-widgets for the sampler decks -->
 					<WidgetGroup>
 						<Pos>0,0</Pos>
-						<Size>250f,110</Size>
+						<Size>250,100</Size> 
 						<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
 						<Children>
 							<!--
@@ -1208,6 +1217,188 @@ Text- Artist
 -->
 						</Children>
 					</WidgetGroup>
+				
+				<!--
+				***********************************************************
+				Sampler 2
+				***********************************************************
+				-->				
+					<WidgetGroup>
+						<Pos>270,0</Pos>
+						<Size>250,100</Size> 
+						<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+						<Children>
+							<!--
+							**********************************************
+Text- Track Title
+							**********************************************
+							
+							<Text>
+								<TooltipId>text</TooltipId>
+								<Style>QLabel { font: bold 13px/17px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+								background-color: transparent; color: #3087BF; text-align: left; padding-left: 1px; }
+								</Style>
+								<Group>[Sampler1]</Group>
+								<Pos>5,5</Pos>
+								<Size>250,21</Size>
+							</Text>-->
+
+
+							<!--
+							**********************************************
+Text- Artist
+							**********************************************
+							-->
+
+							<TrackProperty>
+								<TooltipId>artist</TooltipId>
+								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+								background-color: transparent; color: #000000; text-align: left; padding-left: 1px; }
+								</Style>
+								<Property>artist</Property>
+								<Group>[Sampler2]</Group>
+								<Pos>4,4</Pos>
+								<Size>250,100</Size>
+							</TrackProperty>
+
+
+							Alternative "TITLE ONLY" display
+							<TrackProperty>
+								<TooltipId>track_title</TooltipId>
+								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+								background-color: transparent; color: #000000; text-align: left; padding-left: 1px; }
+								</Style>
+								<Property>title</Property>
+								<Group>[Sampler2]</Group>
+								<Pos>4,25</Pos>
+								<Size>258f,20</Size>
+							</TrackProperty>
+							
+
+
+
+<!--
+							**********************************************
+							Visual- Waveform overview
+							**********************************************
+							-->
+							<Overview>
+								<TooltipId>waveform_overview</TooltipId>
+								<Style></Style>
+								<Group>[Sampler2]</Group>
+								<Pos>5,55</Pos>
+								<Size>140,25</Size>
+								<BgColor></BgColor>
+								<SignalHighColor></SignalHighColor>
+								<SignalMidColor></SignalMidColor>
+								<SignalLowColor></SignalLowColor>
+								<SignalColor>##CC0000</SignalColor>
+								<PlayPosColor>#00FF00</PlayPosColor>
+								<DefaultMark>
+									<Align>bottom</Align>
+									<Color>#00FF00</Color>
+									<TextColor>#FFFFFF</TextColor>
+									<Text> %1 </Text>
+								</DefaultMark>
+								<Connection>
+									<ConfigKey>[Sampler2],playposition</ConfigKey>
+									<EmitOnDownPress>false</EmitOnDownPress>
+								</Connection>
+							</Overview>
+
+
+							<!--
+							****************************************
+							 Button- Play
+							****************************************
+							-->
+							<PushButton>
+								<TooltipId>play_start</TooltipId>
+                                                               
+								<Style></Style>
+								<NumberStates>2</NumberStates>
+								<RightClickIsPushButton>true</RightClickIsPushButton>
+								<State>
+									<Number>0</Number>
+									<Pressed>btn_play_over_sampler.png</Pressed>
+									<Unpressed>btn_play_sampler.png</Unpressed>
+								</State>
+								<State>
+									<Number>1</Number>
+									<Pressed>btn_play_sampler.png</Pressed>
+									<Unpressed>btn_play_over_sampler.png</Unpressed>
+								</State>
+								<Pos>200,50</Pos>
+								<Connection>
+									<ConfigKey>[Sampler2],play</ConfigKey>
+									<EmitOnDownPress>true</EmitOnDownPress>
+									<ButtonState>LeftButton</ButtonState>
+								</Connection>
+								<Connection>
+									<ConfigKey>[Sampler2],start</ConfigKey>
+									<EmitOnDownPress>true</EmitOnDownPress>
+									<ButtonState>RightButton</ButtonState>
+									<ConnectValueToWidget>false</ConnectValueToWidget>
+
+							
+								</Connection>
+							</PushButton>
+
+
+		<!--
+							**********************************************
+							Button- STOP
+							**********************************************
+							-->
+							<PushButton>
+								<TooltipId>cue_default_cue_gotoandstop</TooltipId>
+								<Style></Style>
+								<NumberStates>1</NumberStates>
+								<State>
+									<Number>0</Number>
+									<Pressed>btn_stop_red.png</Pressed>
+									<Unpressed>btn_stop.png</Unpressed>
+								</State>
+								<Pos>150,50</Pos>
+								<Connection>
+									<ConfigKey>[Sampler2],start_stop</ConfigKey>
+									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+									<ButtonState>LeftButton</ButtonState>
+								</Connection>
+								<Connection>
+									<ConfigKey>[Sampler2],start_stop</ConfigKey>
+									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+									<ButtonState>RightButton</ButtonState>
+								</Connection>
+							</PushButton>
+				
+							<!--
+							**********************************************
+							Visual - Volume level display
+							**********************************************
+							-->
+<!--
+							<VuMeter>
+								<TooltipId>channel_VuMeter</TooltipId>
+								<Style></Style>
+								<PathVu>btn_volume_display_sampler_over.png</PathVu>
+								<PathBack>btn_volume_display_sampler.png</PathBack>
+								<Pos>100,24</Pos>
+								<Horizontal>false</Horizontal>
+								<PeakHoldSize>5</PeakHoldSize>
+								<PeakHoldTime>500</PeakHoldTime>
+								<PeakFallTime>50</PeakFallTime>
+								<PeakFallStep>2</PeakFallStep>
+								<Connection>
+									<ConfigKey>[Sampler1],VuMeter</ConfigKey>
+								</Connection>
+							</VuMeter>
+-->
+		                </Children>
+	                </WidgetGroup>
 				</Children>
 			</WidgetGroup>
+		</Children>
+	</WidgetGroup>
+	
 </skin>