Changeset 9019 in orxonox.OLD for trunk

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

Files:

• lib/gui/gl/glgui_widget.cc (modified) (1 diff)
• lib/sound/ogg_player.cc (modified) (3 diffs)
• lib/sound/ogg_player.h (modified) (3 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.cc (modified) (2 diffs)
• world_entities/environments/mapped_water.cc (modified) (9 diffs)
• world_entities/player.cc (modified) (4 diffs)
• world_entities/player.h (modified) (2 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;
   };
 

trunk/src/story_entities/game_world_data.cc

@@ -389 +389 @@
     std::string oggFile = ResourceManager::getFullName(name);
     this->music = new OrxSound::OggPlayer(oggFile);
+    if (this->localPlayer != NULL)
+      this->localPlayer->hud().notifyUser(std::string("Playing SoundTrack: ") + this->music->artist() + " - " + this->music->title());
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/world_entities/elements/glgui_radar.cc

@@ -42 +42 @@
     this->setBackgroundTexture("gui_radar.png");
 
-    this->_updateInterval = 1.0f;
+    this->_updateInterval = .01f;
     this->_timePassed = 0.0f;
     this->_range = 100.0f;
@@ -94 +94 @@
     _timePassed+=dt;
 
-    //if (_timePassed > _updateInterval)
+    if (_timePassed > _updateInterval)
     {
       _timePassed = 0 ; //-=_updateInterval;

trunk/src/world_entities/environments/mapped_water.cc

@@ -351 +351 @@
       OrxGui::GLGuiBox* waterColorBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* waterColorText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* waterColorText = new OrxGui::GLGuiText();
         waterColorText->setText("WaterColor");
         waterColorBox->pack(waterColorText);
@@ -380 +380 @@
       OrxGui::GLGuiBox* waterUVBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* waterUVText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* waterUVText = new OrxGui::GLGuiText();
         waterUVText->setText("WaterUV");
         waterUVBox->pack(waterUVText);
@@ -395 +395 @@
       OrxGui::GLGuiBox* waterFlowBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* waterFlowText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* waterFlowText = new OrxGui::GLGuiText();
         waterFlowText->setText("WaterFlow");
         waterFlowBox->pack(waterFlowText);
@@ -410 +410 @@
       OrxGui::GLGuiBox* shineSizeBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* shineSizeText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* shineSizeText = new OrxGui::GLGuiText();
         shineSizeText->setText("ShineSize");
         shineSizeBox->pack(shineSizeText);
@@ -425 +425 @@
       OrxGui::GLGuiBox* shineStrengthBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* shineStrengthText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* shineStrengthText = new OrxGui::GLGuiText();
         shineStrengthText->setText("ShineStrength");
         shineStrengthBox->pack(shineStrengthText);
@@ -440 +440 @@
       OrxGui::GLGuiBox* reflStrengthBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* reflStrengthText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* reflStrengthText = new OrxGui::GLGuiText();
         reflStrengthText->setText("ReflStrength");
         reflStrengthBox->pack(reflStrengthText);
@@ -455 +455 @@
       OrxGui::GLGuiBox* refractionBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* refractionText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* refractionText = new OrxGui::GLGuiText();
         refractionText->setText("Refraction");
         refractionBox->pack(refractionText);
@@ -470 +470 @@
       OrxGui::GLGuiBox* lightPosBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* lightPosText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* lightPosText = new OrxGui::GLGuiText();
         lightPosText->setText("LightPos");
         lightPosBox->pack(lightPosText);
@@ -499 +499 @@
       OrxGui::GLGuiBox* waterHeightBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        OrxGui::GLGuiInputLine* waterHeightText = new OrxGui::GLGuiInputLine();
+        OrxGui::GLGuiText* waterHeightText = new OrxGui::GLGuiText();
         waterHeightText->setText("WaterHeight");
         waterHeightBox->pack(waterHeightText);

trunk/src/world_entities/player.cc

@@ -38 +38 @@
 
   this->playable = NULL;
-  this->hud.setVisibility(true);
+  this->_hud.setVisibility(true);
 
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
@@ -62 +62 @@
   {
     PRINTF(4)("Player gets ejected from Playable\n");
-    this->hud.setEnergyWidget(NULL);
-    this->hud.setWeaponManager(NULL);
+    this->_hud.setEnergyWidget(NULL);
+    this->_hud.setWeaponManager(NULL);
 
     Playable* ejectedPlayable = this->playable;
@@ -75 +75 @@
     PRINTF(4)("Enter new Playable\n");
       this->playable = playable;
-      this->hud.setEnergyWidget(this->playable->getHealthWidget());
-      this->hud.setWeaponManager(&this->playable->getWeaponManager());
+      this->_hud.setEnergyWidget(this->playable->getHealthWidget());
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 
       this->playable->setPlayer(this);
@@ -96 +96 @@
  void Player::weaponConfigChanged()
  {
-   this->hud.updateWeaponManager();
+   this->_hud.updateWeaponManager();
  }
 

trunk/src/world_entities/player.h

@@ -32 +32 @@
     inline Playable*  getPlayable() const  { return this->playable; };
 
-//     inline Hud& hud() { return this->_hud; };
-//     inline const Hud& hud() const { return this->_hud; };
+     inline Hud& hud() { return this->_hud; };
+     inline const Hud& hud() const { return this->_hud; };
 
 
@@ -43 +43 @@
   private:
     Playable*         playable;                 //!< The one we controll or NULL if none
-    Hud               hud;                      //!< The HUD to be displayed for this Player.
+    Hud               _hud;                      //!< The HUD to be displayed for this Player.
 };