Changeset 9019 in orxonox.OLD for trunk/src/lib

Timestamp:

Jul 2, 2006, 4:41:32 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: OggPlayer retrieves Information about the current Title
The Title Played is relayed to the Hud's Notifier

Location:

trunk/src/lib

Files:

• gui/gl/glgui_widget.cc (modified) (1 diff)
• sound/ogg_player.cc (modified) (3 diffs)
• sound/ogg_player.h (modified) (3 diffs)

trunk/src/lib/gui/gl/glgui_widget.cc

@@ -116 +116 @@
     this->_style[3]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    this->setForegroundColor(Color(1, 0, 0, 1), OrxGui::Normal);
-    this->setForegroundColor(Color(0, 0, 1, 1), OrxGui::Selected);
-    this->setForegroundColor(Color(0, 1, 0, 1), OrxGui::Focused);
+    this->setForegroundColor(Color(.8, .8, 1, 1), OrxGui::Normal);
+    this->setForegroundColor(Color(0, .4, 1.0, 1), OrxGui::Selected);
+    this->setForegroundColor(Color(0, .0, 1.0, 1), OrxGui::Focused);
     this->setForegroundColor(Color(.1, .1, .1, 1), OrxGui::Insensitive);
 

trunk/src/lib/sound/ogg_player.cc

@@ -32 +32 @@
 #include "debug.h"
 #include "compiler.h"
+
+#include "helper_functions.h"
 
 #ifdef HAVE_SDL_SDL_H
@@ -137 +139 @@
     vorbisInfo = ov_info(&oggStream, -1);
     vorbisComment = ov_comment(&oggStream, -1);
+    this->retrieveFileInfo(&oggStream);
 
     if(vorbisInfo->channels == 1)
@@ -469 +472 @@
       alSourceUnqueueBuffers(source, 1, &buffer);
       SoundEngine::checkError("OggPlayer::empty()::unqueue Buffers", __LINE__);
+    }
+  }
+
+
+  void OggPlayer::retrieveFileInfo(OggVorbis_File* file)
+  {
+    vorbis_comment* comment = ov_comment(file, -1);
+    if (comment == NULL)
+    {
+      PRINTF(2)("Retrieving Comment of %s failed\n", this->getName());
+      return;
+    }
+    for (int i = 0; i < comment->comments; ++i)
+    {
+      if (!nocaseCmp("artist=", comment->user_comments[i], 7))
+        this->_artist = comment->user_comments[i]+7;
+      if (!nocaseCmp("title=", comment->user_comments[i], 6))
+        this->_title = comment->user_comments[i] + 6;
+      if (!nocaseCmp("album=", comment->user_comments[i], 6))
+        this->_album = comment->user_comments[i]+6;
     }
   }

trunk/src/lib/sound/ogg_player.h

@@ -59 +59 @@
     bool getState() { return this->state; };
 
+    const std::string& artist() const { return this->_artist; };
+    const std::string& title() const { return this->_title; };
+    const std::string& album() const { return this->_album; };
+
+
     void debug() const;
     void printState() const;
@@ -75 +80 @@
     void empty();
 
+    void retrieveFileInfo(OggVorbis_File* file);
+
   private:
     FILE*               oggFile;              //!< general file-handler, to open the sound-file
@@ -88 +95 @@
     SDL_Thread*         musicThreadID;        //!< The Thread in which music is Played back.
     OrxThread::Mutex    musicMutex;           //!< A Mutex so that the two threads do not interfere.
+
+
+
+    std::string         _title;
+    std::string         _artist;
+    std::string         _album;
+    std::string         _vendor;
   };