Stuff we left out from the feature branches. #embarrassed #willdobetter

TradeMe · May 30, 2014 · f96c4d5 · f96c4d5
1 parent c3bb01b
commit f96c4d5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/PlayMe.Server/PlayMe.Server.csproj b/PlayMe.Server/PlayMe.Server.csproj
@@ -271,7 +271,6 @@
     <Compile Include="UserSettings.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.Debug.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/PlayMe.Server/SoundBoard/ISoundBoardService.cs b/PlayMe.Server/SoundBoard/ISoundBoardService.cs
@@ -1,9 +1,12 @@
 
+using PlayMe.Common.Model;
+
 namespace PlayMe.Server.SoundBoard
 {
     public interface ISoundBoardService
     {
-        void PlayFinishHim();
         void PlayVetoSound();
+
+        void PlayFinishHim(int requiredVetos, QueuedTrack foundTrack);
     }
 }
diff --git a/PlayMe.Server/SoundBoard/SoundBoardService.cs b/PlayMe.Server/SoundBoard/SoundBoardService.cs
@@ -113,6 +113,19 @@ private string GetVetoSound(int vetoCount)
            }
            return string.Empty;
        }
+
+       public void PlayFinishHim(int requiredVetos, QueuedTrack foundTrack)
+       {
+           if (soundBoardSettings.IsEnabled)
+           {
+               var howManyVetosToGo = (requiredVetos - foundTrack.VetoCount);
+
+               if (foundTrack.LikeCount > 5 && howManyVetosToGo == 1)
+               {
+                   player.PlayFromFile(pathBuilder.BuildFilePath("finishhim.wav"));
+               }
+           }
+       }
     }
 
 

diff --git a/PlayMe.Web/Scripts/app/views/partials/queued-track.html b/PlayMe.Web/Scripts/app/views/partials/queued-track.html
@@ -29,6 +29,10 @@
                     <span data-bind="if: $data.StartedPlayingDateTime"> played at <span data-bind="    timeAndDate: StartedPlayingDateTime"></span></span>
                 </li>
                 </li>
+                <li class="small-text" data-bind="if: $data.StartedPlayingDateTime">
+                    Likes/Vetoes: <span class="badge badge-like" data-bind="text: $data.LikeCount, popover: { template: 'likesPopover', visible: Likes().length, title: 'Liked by' }"></span> 
+                    / <span data-bind="text: $data.VetoCount, popover: { template: 'vetoesPopover', visible: Vetoes().length, title: 'Vetoed by' }" class="badge badge-veto"></span>
+                </li>
             </ul>
         </li>
         <!--

diff --git a/PlayMe.Web/Web.config b/PlayMe.Web/Web.config
@@ -58,9 +58,6 @@
       <remove name="TRACEVerbHandler" />
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-    </staticContent>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">