Changeset 9869 in orxonox.OLD for trunk/src/lib/sound/ogg_player.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/sound/ogg_player.h (modified) (3 diffs)

trunk/src/lib/sound/ogg_player.h

@@ -13 +13 @@
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
-#include "threading.h"
+#include "util/threading.h"
 
 struct File;
@@ -25 +25 @@
   class OggPlayer : public BaseObject
   {
+    ObjectListDeclaration(OggPlayer);
+
   public:
     /**
@@ -98 +100 @@
 
 
-    std::string         _title;
-    std::string         _artist;
-    std::string         _album;
-    std::string         _vendor;
+    std::string         _title;               //!< Song Title.
+    std::string         _artist;              //!< Artist Name of the current song.
+    std::string         _album;               //!< Album Name of the current song.
+    std::string         _vendor;              //!< Vendor Name of the current song.
   };