Merge branch 'feature/Drag_and_drop' into develop

Author: MatthewCech

Build/RH/ResourceHacker.log

@@ -4,13 +4,13 @@
 namespace ASCIIPlayer
 {
   // Static init.
-  APUnique AudioFile::uniqueID_ = 0; // ID for lookup in the audio system
+  APUnique AudioFile::uniqueID_STATIC_VAR_ = 0; // ID for lookup in the audio system
 
 
   // Constructor and Destructor
   AudioFile::AudioFile(std::string path) 
     : path_(path)
-    , fileID_(uniqueID_++)
+    , fileID_(uniqueID_STATIC_VAR_++)
     , loadedObjects_() // Assigned via lazy init later
   {  }
 

Installer/ascii_player.exe

@@ -40,6 +40,6 @@ namespace ASCIIPlayer
     std::unordered_map<APUnique, AudioHandleWrapper> loadedObjects_;   // Handle to the loaded object.
 
     // Static Variables
-    static APUnique uniqueID_; // ID for lookup in the audio system
+    static APUnique uniqueID_STATIC_VAR_; // ID for lookup in the audio system
 	};
 }

Installer/output/ASCIIPlayerInstallerv0.1.2.exe

@@ -143,7 +143,7 @@ namespace ASCIIPlayer
 
     // @ToDo: Channel override may result in same song playing multiple times.
     // Test this and confirm if it is an issue that needs to be solved.
-    channelHandles_[audioFile.uniqueID_] = channel;
+    channelHandles_[audioFile.fileID_] = channel;
     audioFile.get(ID_)->BoundToChannel = true;
   }
 
@@ -162,7 +162,7 @@ namespace ASCIIPlayer
 
     // Toggle paused using !
     bool pausedStatus;
-    ChannelHandle ch = channelHandles_[audioFile.uniqueID_];
+    ChannelHandle ch = channelHandles_[audioFile.fileID_];
     FCheck(ch->getPaused(&pausedStatus));
 
     if (pausedState)
@@ -180,7 +180,7 @@ namespace ASCIIPlayer
   // Stops the audio file completely, removing the channel.
   void AudioSystem::StopFile(AudioFile &audioFile)
   {
-    ChannelHandle *ch = &channelHandles_[audioFile.uniqueID_];
+    ChannelHandle *ch = &channelHandles_[audioFile.fileID_];
     bool playing;
     (*ch)->isPlaying(&playing);
     if(playing)
@@ -233,14 +233,14 @@ namespace ASCIIPlayer
   bool AudioSystem::IsActive(AudioFile &audioFile)
   {
     bool status;
-    channelHandles_[audioFile.uniqueID_]->isPlaying(&status);
+    channelHandles_[audioFile.fileID_]->isPlaying(&status);
     return status;
   }
 
   bool AudioSystem::IsPaused(AudioFile &audioFile)
   {
     bool status;
-    channelHandles_[audioFile.uniqueID_]->getPaused(&status);
+    channelHandles_[audioFile.fileID_]->getPaused(&status);
     return status;
   }
 
@@ -260,7 +260,7 @@ namespace ASCIIPlayer
       return 0;
 
     unsigned int tu;
-    FCheck(channelHandles_[audioFile.uniqueID_]->getPosition(&tu, FMOD_TIMEUNIT_MS));
+    FCheck(channelHandles_[audioFile.fileID_]->getPosition(&tu, FMOD_TIMEUNIT_MS));
     return tu;
   }
 
@@ -275,7 +275,7 @@ namespace ASCIIPlayer
     if (length <= pos)
       pos = length - 1;
 
-    FCheck(channelHandles_[audioFile.uniqueID_]->setPosition(pos, FMOD_TIMEUNIT_MS));
+    FCheck(channelHandles_[audioFile.fileID_]->setPosition(pos, FMOD_TIMEUNIT_MS));
   }
 
 

Source/AudioFile.cpp

@@ -75,7 +75,7 @@ namespace ASCIIPlayer
     if (!hasShutdown_)
     {
       // Update the song and proceed if necessary
-      if (!audioSystem_.IsActive(*currSong_))
+      if (currSong_ && !audioSystem_.IsActive(*currSong_))
       {
         playlist_.Next();
 
@@ -96,7 +96,7 @@ namespace ASCIIPlayer
         }
 
         // Draw overlay after visualizer so it's "On top"
-        if (overlay_)
+        if (currSong_ && overlay_)
         {
           overlay_->Update(
             UIInfo(requestUIActive_
@@ -148,6 +148,10 @@ namespace ASCIIPlayer
     }
   }
 
+  bool DJ::IsPaused()
+  {
+    return paused_;
+  }
 
   // Toggles if it's paused or not
   void DJ::TogglePause()
@@ -189,8 +193,15 @@ namespace ASCIIPlayer
   // The DJ does NOT handle deallocation for you, in case you wanted to add this to other DJs.
   void DJ::AddSong(AudioFile *toAdd)
   {
+    bool start = false;
+    if (playlist_.GetPlaylistLength() == 0)
+      start = true;
+
     if(audioSystem_.PreloadFile(*toAdd))
       playlist_.Add(toAdd);
+
+    if (start)
+      Play();
   }
 
 

Source/AudioFile.hpp

@@ -22,6 +22,7 @@ namespace ASCIIPlayer
     bool Update();
     void Play();
     void Pause();
+    bool IsPaused();
     void TogglePause();
     void ToggleRequestUIActive();
     void Shutdown();
@@ -41,7 +42,7 @@ namespace ASCIIPlayer
   private:
     // Callback
     void playlistUpdatedCallback();
-	void updateLastVolumeChange();
+	  void updateLastVolumeChange();
 
     // Variables
     Playlist<DJ> playlist_;       // Contains the AudioFile objects.

Source/AudioSystem.cpp

@@ -198,7 +198,14 @@ namespace ASCIIPlayer
 
   void Lobby::interpretPath(const std::string str)
   {
-
+    std::string input = str;
+    if (str[0] == '"' && str[str.size() - 1] == '"')
+      input = str.substr(1, str.size() - 2);
+    if (str[0] == '\\' && str[str.size() - 1] == '"')
+      input = str.substr(2, str.size() - 4);
+
+    AudioFile *test1 = new ASCIIPlayer::AudioFile(input);
+    activeDJ_->AddSong(test1);
   }
 
   void Lobby::interpretString(const std::string command)
@@ -410,7 +417,7 @@ namespace ASCIIPlayer
     activeDJ_ = newDJ;
   }
 
-
+  // Move to the right in the menu
   bool Lobby::menuMoveCheckRight()
   {
     if (menuSystems_.MenuDepth() == 2)
@@ -423,7 +430,7 @@ namespace ASCIIPlayer
     return false;
   }
 
-
+  // Move to the left in the menu, wrapps the actions assoicated with it
   bool Lobby::menuMoveCheckLeft()
   {
     if (menuSystems_.MenuDepth() == 2)

Source/DJ.cpp

@@ -32,8 +32,8 @@ namespace ASCIIPlayer
 
     // Variables
     std::vector<AudioFile*> playlist_; // Holds songs to be played.
-    unsigned int activeIndex_;        // Active index into the playlist.
-    bool looping_;                    // Are we looping this playlist?
+    unsigned int activeIndex_;         // Active index into the playlist.
+    bool looping_;                     // Are we looping this playlist?
 
     // Callback info.
     void(T::*toCallOnUpdate_)();
@@ -58,10 +58,12 @@ namespace ASCIIPlayer
   // Adds a new audiofile to a playlist.
   template<typename T> void Playlist<T>::Add(AudioFile *file)
   {
+    
     playlist_.push_back(file);
-
-    if(playlist_.size() == 1)
-      listUpdateCallback();
+    
+    // Update to the added song and update the list
+    activeIndex_ = playlist_.size() - 1;
+    listUpdateCallback();
   }
 
 
@@ -103,6 +105,9 @@ namespace ASCIIPlayer
   // If possible, will attempt to go to the next song.
   template<typename T> void Playlist<T>::Next()
   {
+    if (playlist_.size() == 0)
+      return;
+
     if (activeIndex_ < playlist_.size() - 1)
     {
       ++activeIndex_;