add a pause/slowdown/play/fastforward button for replays

closes #4633
2014-03-12 11:51:36 +01:00
parent c5ef9cbfb2
commit 0c20e38443
21 changed files with 482 additions and 282 deletions
--- a/1
+++ b/1
@@ -23,6 +23,7 @@ NEW:
 		Order lines are now shown on unit selection.
 		Fixed chat synchronization in replays.
 		Added a combined shroud view of every player to the replay viewer and spectator mode.
+		Added pause, slowdown, play and fastforward buttons for replays.
 		Fixed the game sometimes crashing when deploying and activating the guard cursor at the same time.
 		Build time is now set when an item reaches the front of a queue, instead of immediately when queued.
 		The attack cursor now changes if the target is out of range.
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -167,6 +167,8 @@ namespace OpenRA
 			var dt = t - orderManager.LastTickTime;
 			var world = orderManager.world;
 			var timestep = world == null ? Timestep : world.Timestep;
+			if (timestep == 0)
+				return;
 			if (dt >= timestep)
 				using (new PerfSample("tick_time"))
 				{
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -66,9 +66,14 @@ namespace OpenRA
 			}
 		}

+		public bool IsReplay
+		{
+			get { return orderManager.Connection is ReplayConnection; }
+		}
+
 		public void SetLocalPlayer(string pr)
 		{
-			if (orderManager.Connection is ReplayConnection)
+			if (IsReplay)
 				return;

 			LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -481,6 +481,7 @@
    <Compile Include="Modifiers\DisabledOverlay.cs" />
    <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
    <Compile Include="Immobile.cs" />
+    <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
--- a/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Linq;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets.Logic
+{
+	public class ReplayControlBarLogic
+	{
+
+		[ObjectCreator.UseCtor]
+		public ReplayControlBarLogic(Widget widget, World world)
+		{
+			if (world.IsReplay)
+			{
+				var container = widget.Get<ContainerWidget>("REPLAY_PLAYER");
+
+				var background = widget.Parent.GetOrNull<BackgroundWidget>("OBSERVER_CONTROL_BG");
+				if (background != null)
+					background.Bounds.Height += container.Bounds.Height;
+
+				container.Visible = true;
+
+				var pauseButton = widget.Get<ButtonWidget>("BUTTON_PAUSE");
+				pauseButton.IsHighlighted = () => world.Timestep == 0;
+				pauseButton.OnClick = () => world.Timestep = 0;
+
+				var slowButton = widget.Get<ButtonWidget>("BUTTON_SLOW");
+				slowButton.IsHighlighted = () => world.Timestep > Game.Timestep;
+				slowButton.OnClick = () => world.Timestep = Game.Timestep * 2;
+
+				var normalSpeedButton = widget.Get<ButtonWidget>("BUTTON_NORMALSPEED");
+				normalSpeedButton.IsHighlighted = () => world.Timestep == Game.Timestep;
+				normalSpeedButton.OnClick = () => world.Timestep = Game.Timestep;
+
+				var fastforwardButton = widget.Get<ButtonWidget>("BUTTON_FASTFORWARD");
+				fastforwardButton.IsHighlighted = () => world.Timestep == 1;
+				fastforwardButton.OnClick = () => world.Timestep = 1;
+			}
+		}
+	}
+}
--- a/artsrc/cnc/chrome.svg
+++ b/artsrc/cnc/chrome.svg
@@ -13,9 +13,9 @@
   height="512"
   id="svg2"
   version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
   sodipodi:docname="chrome.svg"
-   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/chrome.png"
+   inkscape:export-filename="/home/matthias/Projekte/OpenRA/mods/cnc/uibits/chrome.png"
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   enable-background="new">
@@ -100,16 +100,16 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="5.6568539"
-     inkscape:cx="371.83537"
-     inkscape:cy="425.37964"
+     inkscape:cx="424.27411"
+     inkscape:cy="420.32669"
     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
+     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1386"
-     inkscape:window-height="856"
-     inkscape:window-x="54"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1060"
+     inkscape:window-x="1364"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
     showguides="true"
     inkscape:guide-bbox="true">
    <sodipodi:guide
@@ -201,7 +201,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -1355,6 +1355,21 @@
       id="path3208"
       d="m 416,596.3622 -4,4 0,0 4,4 z"
       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <g
+       transform="matrix(0.94409778,0,0,0.94409778,123.40976,207.65261)"
+       id="g4025">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3255"
+         d="m 293.4933,422.60165 6.8192,6.99268 0.0273,-7.03284 6.82877,6.91201 0.005,-7.62083 2.29527,0.005 -0.005,14.25414 -2.23215,0.005 -0.0158,-6.65429 -6.81074,6.06193 -0.0904,-5.97264 -6.83307,5.97605 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 401.0505,632.91722 1.89097,0 0,-1.83277 1.86185,0.0291 0,1.7455 1.80369,-0.0291 0.0291,-0.84366 0.93092,0 0.0291,0.84366 1.74549,0 0.0291,-1.7746 2.7928,0.0291 0,1.7746 1.92005,0.0291 -0.0291,-0.84366 -1.0182,0 0,-2.88008 1.83278,0 0,-0.87276 0.98911,-0.0291 -0.0401,-1.79618 -2.79765,-0.0205 0,0.91541 -1.82052,0.0205 0.0205,-1.86167 -1.86168,0.0107 0,-0.9154 -1.84109,0 0.0107,-0.93598 -2.82851,0 0.0205,0.9257 -1.82052,0.0108 0.0107,0.94627 -0.92569,0 -0.0107,0.90511 -0.9257,0 -0.0107,2.77706 -0.89484,0 0,0.88456 1.79995,0.0107 0.0107,1.86168 -0.89483,-0.0205 z"
+       id="path4064"
+       inkscape:connector-curvature="0" />
  </g>
  <g
     inkscape:groupmode="layer"
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -388,6 +388,8 @@ music: chrome.png
 	play: 288,0,16,16
 	next: 256,16,16,16
 	prev: 272,16,16,16
+	fastforward: 400,64,16,16
+	slowmo: 400,80,16,16

 lobby-bits: chrome.png
 	spawn-claimed: 256,32,16,16
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -56,6 +56,7 @@ Container@INGAME_ROOT:
 			TooltipContainer:TOOLTIP_CONTAINER
 		Container@PLAYER_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
+
 Container@OBSERVER_WIDGETS:
 	Children:
 		Button@OPTIONS_BUTTON:
@@ -85,14 +86,86 @@ Container@OBSERVER_WIDGETS:
 					Y:1
 					Width:PARENT_RIGHT-2
 					Height:PARENT_BOTTOM-2
-		DropDownButton@SHROUD_SELECTOR:
-			Logic:ObserverShroudSelectorLogic
+		Background@OBSERVER_CONTROL_BG:
 			X:WINDOW_RIGHT-173
 			Y:172
 			Width:168
-			Height:25
-			Font:Bold
-			Visible:true
+			Height:35
+			Background:panel-black
+			Children:
+				DropDownButton@SHROUD_SELECTOR:
+					Logic:ObserverShroudSelectorLogic
+					X:5
+					Y:5
+					Width:158
+					Height:25
+					Font:Bold
+					Visible:true
+				Container@REPLAY_PLAYER:
+					Logic:ReplayControlBarLogic
+					X:PARENT_RIGHT/2 - 70
+					Y:30
+					Width:160
+					Height:35
+					Visible:false
+					Children:
+						Button@BUTTON_PAUSE:
+							X:5
+							Y:5
+							Width:26
+							Height:26
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PAUSE:
+									X:5
+									Y:5
+									Width:16
+									Height:16
+									ImageCollection:music
+									ImageName:pause
+						Button@BUTTON_SLOW:
+							X:40
+							Y:5
+							Width:26
+							Height:26
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_SLOW:
+									X:5
+									Y:5
+									Width:16
+									Height:16
+									ImageCollection:music
+									ImageName:slowmo
+						Button@BUTTON_NORMALSPEED:
+							X:75
+							Y:5
+							Width:26
+							Height:26
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PLAY:
+									X:5
+									Y:5
+									Width:16
+									Height:16
+									ImageCollection:music
+									ImageName:play
+						Button@BUTTON_FASTFORWARD:
+							X:110
+							Y:5
+							Width:26
+							Height:26
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_FASTFORWARD:
+									X:5
+									Y:5
+									Width:16
+									Height:16
+									ImageCollection:music
+									ImageName:fastforward
+
 Container@PLAYER_WIDGETS:
 	Children:
 		LogicTicker@SIDEBAR_TICKER:
--- a/mods/cnc/uibits/chrome.png
+++ b/mods/cnc/uibits/chrome.png
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -258,6 +258,8 @@ music: musicplayer.png
 	play: 56,0,25,25
 	next: 84,0,25,25
 	prev: 112,0,25,25
+	fastforward: 140,0,25,25
+	slowmo: 168,0,25,25

 scrollbar: buttons.png
 	down_arrow: 16,112,16,16
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -0,0 +1,104 @@
+Container@PLAYER_WIDGETS:
+	Children:
+		LogicTicker@SIDEBAR_TICKER:
+		Button@INGAME_DIPLOMACY_BUTTON:
+			X:162
+			Y:0
+			Width:160
+			Height:25
+			Text:Diplomacy (F1)
+			Font:Bold
+			Key: f1
+		Button@CHEATS_BUTTON:
+			X:324
+			Y:0
+			Width:160
+			Height:25
+			Text:Cheats (F2)
+			Visible:false
+			Font:Bold
+			Key: f2
+		Button@OBJECTIVES_BUTTON:
+			X:486
+			Y:0
+			Width:160
+			Height:25
+			Text:Objectives (F3)
+			Visible:false
+			Font:Bold
+			Key: f3
+		SlidingContainer@INGAME_RADAR_BIN:
+			X:WINDOW_RIGHT-215
+			Y:0
+			OpenOffset:0,29
+			ClosedOffset:0,-166
+			AnimationLength:15
+			Children:
+				Image@RADAR_BIN_BG:
+					ImageName:radar
+				Radar@RADAR_MINIMAP:
+					WorldInteractionController:INTERACTION_CONTROLLER
+					X:9
+					Width:192
+					Height:192
+				ResourceBar@POWERBAR:
+					X:42
+					Y:205
+					Width:138
+					Height:5
+					TooltipContainer:TOOLTIP_CONTAINER
+					IndicatorImage:power-indicator
+					Orientation:Horizontal
+					Style:Bevelled
+		MoneyBin@INGAME_MONEY_BIN:
+			X:WINDOW_RIGHT - WIDTH
+			Y:0
+			Width:320
+			Height: 32
+			Children:
+				OrderButton@SELL:
+					Logic:OrderButtonsChromeLogic
+					X:3
+					Y:0
+					Width:30
+					Height:30
+					Image:sell
+					Description:Sell
+					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
+				OrderButton@POWER_DOWN:
+					Logic:OrderButtonsChromeLogic
+					X:39
+					Y:0
+					Width:30
+					Height:30
+					Image:power
+					Description:Powerdown
+					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
+				OrderButton@REPAIR:
+					Logic:OrderButtonsChromeLogic
+					X:75
+					Y:0
+					Width:30
+					Height:30
+					Image:repair
+					Description:Repair
+					LongDesc:Repair damaged buildings
+		SupportPowerBin@INGAME_POWERS_BIN:
+			X:0
+			Y:25
+			IconWidth: 60
+			IconHeight: 48
+			ReadyText: READY
+			HoldText: ON HOLD
+		BuildPalette@INGAME_BUILD_PALETTE:
+			X:WINDOW_RIGHT - 250
+			Y:280
+			Width:238
+			Height:500
+			ReadyText:@ready@
+			HoldText:@on-hold@
+			RequiresText:@requires@
+			IconWidth: 60
+			IconHeight: 48
+			Columns: 3
+			Rows: 4
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -77,138 +77,3 @@ Container@INGAME_ROOT:
 							Width:200
 							Height:200
 		TooltipContainer@TOOLTIP_CONTAINER:
-
-Container@PLAYER_WIDGETS:
-	Children:
-		LogicTicker@SIDEBAR_TICKER:
-		Button@INGAME_DIPLOMACY_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Diplomacy (F1)
-			Font:Bold
-			Key: f1
-		Button@CHEATS_BUTTON:
-			X:324
-			Y:0
-			Width:160
-			Height:25
-			Text:Cheats (F2)
-			Visible:false
-			Font:Bold
-			Key: f2
-		Button@OBJECTIVES_BUTTON:
-			X:486
-			Y:0
-			Width:160
-			Height:25
-			Text:Objectives (F3)
-			Visible:false
-			Font:Bold
-			Key: f3
-		SlidingContainer@INGAME_RADAR_BIN:
-			X:WINDOW_RIGHT-215
-			Y:0
-			OpenOffset:0,29
-			ClosedOffset:0,-166
-			AnimationLength:15
-			Children:
-				Image@RADAR_BIN_BG:
-					ImageName:radar
-				Radar@RADAR_MINIMAP:
-					WorldInteractionController:INTERACTION_CONTROLLER
-					X:9
-					Width:192
-					Height:192
-				ResourceBar@POWERBAR:
-					X:42
-					Y:205
-					Width:138
-					Height:5
-					TooltipContainer:TOOLTIP_CONTAINER
-					IndicatorImage:power-indicator
-					Orientation:Horizontal
-					Style:Bevelled
-		MoneyBin@INGAME_MONEY_BIN:
-			X:WINDOW_RIGHT - WIDTH
-			Y:0
-			Width:320
-			Height: 32
-			Children:
-				OrderButton@SELL:
-					Logic:OrderButtonsChromeLogic
-					X:3
-					Y:0
-					Width:30
-					Height:30
-					Image:sell
-					Description:Sell
-					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
-				OrderButton@POWER_DOWN:
-					Logic:OrderButtonsChromeLogic
-					X:39
-					Y:0
-					Width:30
-					Height:30
-					Image:power
-					Description:Powerdown
-					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
-				OrderButton@REPAIR:
-					Logic:OrderButtonsChromeLogic
-					X:75
-					Y:0
-					Width:30
-					Height:30
-					Image:repair
-					Description:Repair
-					LongDesc:Repair damaged buildings
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-			IconWidth: 60
-			IconHeight: 48
-			ReadyText: READY
-			HoldText: ON HOLD
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X:WINDOW_RIGHT - 250
-			Y:280
-			Width:238
-			Height:500
-			ReadyText:@ready@
-			HoldText:@on-hold@
-			RequiresText:@requires@
-			IconWidth: 60
-			IconHeight: 48
-			Columns: 3
-			Rows: 4
-
-Container@OBSERVER_WIDGETS:
-	Children:
-		Button@INGAME_STATS_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Statistics (F1)
-			Font:Bold
-			Key:f1
-		Background@RADAR_BG:
-			X:WINDOW_RIGHT-255
-			Y:5
-			Width:250
-			Height:250
-			Children:
-				Radar@INGAME_RADAR:
-					X:10
-					Y:10
-					Width:PARENT_RIGHT-19
-					Height:PARENT_BOTTOM-19
-					WorldInteractionController:INTERACTION_CONTROLLER
-		DropDownButton@SHROUD_SELECTOR:
-			Logic:ObserverShroudSelectorLogic
-			X:WINDOW_RIGHT-250
-			Y:260
-			Width:240
-			Height:25
-			Font:Bold
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -62,7 +62,9 @@ ChromeLayout:
 	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
+	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
+	mods/d2k/chrome/ingame-player.yaml
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml
--- a/mods/ra/chrome.yaml
+++ b/mods/ra/chrome.yaml
@@ -120,7 +120,7 @@ tabs-normal: tabs.png
 	soviet-Helicopter: 54,160,27,41
 	soviet-Ship: 134,200,27,41

-# Used for the menu	
+# Used for the menu
 dialog: dialog.png
 	background: 0,0,480,480
 	border-r: 489,0,9,192
@@ -208,6 +208,8 @@ music: musicplayer.png
 	play: 56,0,25,25
 	next: 84,0,25,25
 	prev: 112,0,25,25
+	fastforward: 140,0,25,25
+	slowmo: 168,0,25,25

 scrollbar: buttons.png
 	down_arrow: 16,112,16,16
--- a/mods/ra/chrome/ingame-observer.yaml
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -0,0 +1,99 @@
+Container@OBSERVER_WIDGETS:
+	Children:
+		Button@INGAME_STATS_BUTTON:
+			X:162
+			Y:0
+			Width:160
+			Height:25
+			Text:Statistics (F1)
+			Font:Bold
+			Key:f1
+		Background@RADAR_BG:
+			X:WINDOW_RIGHT-255
+			Y:5
+			Width:250
+			Height:250
+			Children:
+				Radar@INGAME_RADAR:
+					X:10
+					Y:10
+					Width:PARENT_RIGHT-19
+					Height:PARENT_BOTTOM-19
+					WorldInteractionController:INTERACTION_CONTROLLER
+		Background@OBSERVER_CONTROL_BG:
+			X:WINDOW_RIGHT-255
+			Y:260
+			Width:250
+			Height:55
+			Children:
+				DropDownButton@SHROUD_SELECTOR:
+					Logic:ObserverShroudSelectorLogic
+					X:15
+					Y:15
+					Width:220
+					Height:25
+					Font:Bold
+				Container@REPLAY_PLAYER:
+					Logic:ReplayControlBarLogic
+					X:PARENT_RIGHT/2 - 80
+					Y:35
+					Width:160
+					Height:35
+					Visible:false
+					Children:
+						Button@BUTTON_PAUSE:
+							X:15
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PAUSE:
+									X:0
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:pause
+						Button@BUTTON_SLOW:
+							X:50
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_SLOW:
+									X:4
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:slowmo
+						Button@BUTTON_NORMALSPEED:
+							X:85
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PLAY:
+									X:0
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:play
+						Button@BUTTON_FASTFORWARD:
+							X:120
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_FASTFORWARD:
+									X:4
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:fastforward
--- a/mods/ra/chrome/ingame-player.yaml
+++ b/mods/ra/chrome/ingame-player.yaml
@@ -0,0 +1,99 @@
+Container@PLAYER_WIDGETS:
+	Children:
+		LogicTicker@SIDEBAR_TICKER:
+		Button@INGAME_DIPLOMACY_BUTTON:
+			X:162
+			Y:0
+			Width:160
+			Height:25
+			Text:Diplomacy (F1)
+			Font:Bold
+			Key: f1
+		Button@CHEATS_BUTTON:
+			X:324
+			Y:0
+			Width:160
+			Height:25
+			Text:Cheats (F2)
+			Visible:false
+			Font:Bold
+			Key: f2
+		Button@OBJECTIVES_BUTTON:
+			X:486
+			Y:0
+			Width:160
+			Height:25
+			Text:Objectives (F3)
+			Visible:false
+			Font:Bold
+			Key: f3
+		SlidingContainer@INGAME_RADAR_BIN:
+			X:WINDOW_RIGHT-215
+			Y:0
+			OpenOffset:0,29
+			ClosedOffset:0,-166
+			AnimationLength:15
+			Children:
+				Image@RADAR_BIN_BG:
+					ImageName:radar
+				Radar@RADAR_MINIMAP:
+					WorldInteractionController:INTERACTION_CONTROLLER
+					X:9
+					Width:192
+					Height:192
+				ResourceBar@POWERBAR:
+					X:42
+					Y:205
+					Width:138
+					Height:5
+					TooltipContainer:TOOLTIP_CONTAINER
+					IndicatorImage:power-indicator
+					Orientation:Horizontal
+					Style:Bevelled
+		MoneyBin@INGAME_MONEY_BIN:
+			X:WINDOW_RIGHT - WIDTH
+			Y:0
+			Width:320
+			Height: 32
+			Children:
+				OrderButton@SELL:
+					Logic:OrderButtonsChromeLogic
+					X:3
+					Y:0
+					Width:30
+					Height:30
+					Image:sell
+					Description:Sell
+					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
+				OrderButton@POWER_DOWN:
+					Logic:OrderButtonsChromeLogic
+					X:39
+					Y:0
+					Width:30
+					Height:30
+					Image:power
+					Description:Powerdown
+					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
+				OrderButton@REPAIR:
+					Logic:OrderButtonsChromeLogic
+					X:75
+					Y:0
+					Width:30
+					Height:30
+					Image:repair
+					Description:Repair
+					LongDesc:Repair damaged buildings
+		SupportPowerBin@INGAME_POWERS_BIN:
+			X:0
+			Y:25
+			ReadyText: @ready@
+			HoldText: @on-hold@
+		BuildPalette@INGAME_BUILD_PALETTE:
+			X:WINDOW_RIGHT - 250
+			Y:280
+			Width:250
+			Height:500
+			ReadyText: @ready@
+			HoldText: @on-hold@
+			RequiresText: @requires@
+
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -77,132 +77,3 @@ Container@INGAME_ROOT:
 							Width:200
 							Height:200
 		TooltipContainer@TOOLTIP_CONTAINER:
-
-Container@PLAYER_WIDGETS:
-	Children:
-		LogicTicker@SIDEBAR_TICKER:
-		Button@INGAME_DIPLOMACY_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Diplomacy (F1)
-			Font:Bold
-			Key: f1
-		Button@CHEATS_BUTTON:
-			X:324
-			Y:0
-			Width:160
-			Height:25
-			Text:Cheats (F2)
-			Visible:false
-			Font:Bold
-			Key: f2
-		Button@OBJECTIVES_BUTTON:
-			X:486
-			Y:0
-			Width:160
-			Height:25
-			Text:Objectives (F3)
-			Visible:false
-			Font:Bold
-			Key: f3
-		SlidingContainer@INGAME_RADAR_BIN:
-			X:WINDOW_RIGHT-215
-			Y:0
-			OpenOffset:0,29
-			ClosedOffset:0,-166
-			AnimationLength:15
-			Children:
-				Image@RADAR_BIN_BG:
-					ImageName:radar
-				Radar@RADAR_MINIMAP:
-					WorldInteractionController:INTERACTION_CONTROLLER
-					X:9
-					Width:192
-					Height:192
-				ResourceBar@POWERBAR:
-					X:42
-					Y:205
-					Width:138
-					Height:5
-					TooltipContainer:TOOLTIP_CONTAINER
-					IndicatorImage:power-indicator
-					Orientation:Horizontal
-					Style:Bevelled
-		MoneyBin@INGAME_MONEY_BIN:
-			X:WINDOW_RIGHT - WIDTH
-			Y:0
-			Width:320
-			Height: 32
-			Children:
-				OrderButton@SELL:
-					Logic:OrderButtonsChromeLogic
-					X:3
-					Y:0
-					Width:30
-					Height:30
-					Image:sell
-					Description:Sell
-					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
-				OrderButton@POWER_DOWN:
-					Logic:OrderButtonsChromeLogic
-					X:39
-					Y:0
-					Width:30
-					Height:30
-					Image:power
-					Description:Powerdown
-					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
-				OrderButton@REPAIR:
-					Logic:OrderButtonsChromeLogic
-					X:75
-					Y:0
-					Width:30
-					Height:30
-					Image:repair
-					Description:Repair
-					LongDesc:Repair damaged buildings
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-			ReadyText: @ready@
-			HoldText: @on-hold@
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X:WINDOW_RIGHT - 250
-			Y:280
-			Width:250
-			Height:500
-			ReadyText: @ready@
-			HoldText: @on-hold@
-			RequiresText: @requires@
-
-Container@OBSERVER_WIDGETS:
-	Children:
-		Button@INGAME_STATS_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Statistics (F1)
-			Font:Bold
-			Key:f1
-		Background@RADAR_BG:
-			X:WINDOW_RIGHT-255
-			Y:5
-			Width:250
-			Height:250
-			Children:
-				Radar@INGAME_RADAR:
-					X:10
-					Y:10
-					Width:PARENT_RIGHT-19
-					Height:PARENT_BOTTOM-19
-					WorldInteractionController:INTERACTION_CONTROLLER
-		DropDownButton@SHROUD_SELECTOR:
-			Logic:ObserverShroudSelectorLogic
-			X:WINDOW_RIGHT-250
-			Y:260
-			Width:240
-			Height:25
-			Font:Bold
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -76,7 +76,9 @@ ChromeLayout:
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
 	mods/ra/chrome/ingame-objectives.yaml
+	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
+	mods/ra/chrome/ingame-player.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml
--- a/mods/ra/uibits/musicplayer.png
+++ b/mods/ra/uibits/musicplayer.png
--- a/mods/ts/chrome.yaml
+++ b/mods/ts/chrome.yaml
@@ -202,6 +202,8 @@ music: musicplayer.png
 	play: 56,0,25,25
 	next: 84,0,25,25
 	prev: 112,0,25,25
+	fastforward: 140,0,25,25
+	slowmo: 168,0,25,25

 scrollbar: buttons.png
 	down_arrow: 16,112,16,16
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -101,7 +101,9 @@ ChromeLayout:
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
 	mods/ra/chrome/ingame-objectives.yaml
+	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
+	mods/ra/chrome/ingame-player.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml