Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4961 in orxonox.OLD for orxonox/trunk/src/util


Ignore:
Timestamp:
Jul 28, 2005, 1:19:50 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: music now plays back, as one would expect, and the ReosurceManager handles ogg's.
Also the naming has changed a bit, and doxygen tags are complete in ogg_player.h/cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/util/resource_manager.cc

    r4836 r4961  
    3434#ifndef NO_AUDIO
    3535#include "sound_engine.h"
     36#include "ogg_player.h"
    3637#endif /* NO_AUDIO */
    3738
    … …  
    228229
    229230/**
    230  *  loads resources
     231 * loads resources
    231232 * @param fileName: The fileName of the resource to load
    232233 * @param type: The Type of Resource to load (\see ResourceType)
    … …  
    346347          if(isFile(fullName))
    347348            tmpResource->pointer = new SoundBuffer(fullName);
     349          break;
     350        case OGG:
     351          if (isFile(fullName))
     352            tmpResource->pointer = new OggPlayer(fullName);
    348353          break;
    349354#endif /* NO_AUDIO */
    … …  
    400405
    401406/**
    402  *  unloads a Resource
     407 * unloads a Resource
    403408 * @param pointer: The pointer to free
    404409 * @param prio: the PriorityLevel to unload this resource
    … …  
    419424
    420425/**
    421  *  unloads a Resource
     426 * unloads a Resource
    422427 * @param resource: The resource to unloade
    423428 * @param prio the PriorityLevel to unload this resource
    … …  
    446451            case WAV:
    447452              delete (SoundBuffer*)resource->pointer;
     453              break;
     454            case OGG:
     455              delete (OggPlayer*)resource->pointer;
    448456              break;
    449457#endif /* NO_AUDIO */
    … …  
    500508
    501509/**
    502  *  Searches for a Resource by some information
     510 * Searches for a Resource by some information
    503511 * @param fileName: The name to look for
    504512 * @param type the Type of resource to locate.
    … …  
    587595
    588596/**
    589  *  Searches for a Resource by Pointer
     597 * Searches for a Resource by Pointer
    590598 * @param pointer the Pointer to search for
    591599 * @returns a Pointer to the Resource if found, NULL otherwise.
    … …  
    610618
    611619/**
    612  *  Checks if it is a Directory
     620 * Checks if it is a Directory
    613621 * @param directoryName the Directory to check for
    614622 * @returns true if it is a directory/symlink false otherwise
    … …  
    657665
    658666/**
    659  *  Checks if the file is either a Regular file or a Symlink
     667 * Checks if the file is either a Regular file or a Symlink
    660668 * @param fileName the File to check for
    661669 * @returns true if it is a regular file/symlink, false otherwise
    … …  
    693701
    694702/**
    695  *  touches a File on the disk (thereby creating it)
     703 * touches a File on the disk (thereby creating it)
    696704 * @param fileName The file to touch
    697705*/
    … …  
    713721
    714722/**
    715  *  deletes a File from disk
     723 * deletes a File from disk
    716724 * @param fileName the File to delete
    717725*/
    … …  
    726734
    727735/**
    728   * @param name the Name of the file to check
    729   * @returns The name of the file, including the HomeDir
    730    IMPORTANT: this has to be deleted from the outside
    731 */
     736 * @param name the Name of the file to check
     737 * @returns The name of the file, including the HomeDir
     738 * IMPORTANT: this has to be deleted from the outside
     739 */
    732740char* ResourceManager::homeDirCheck(const char* name)
    733741{
    … …  
    755763
    756764/**
    757   * @param fileName the Name of the File to check
    758   * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
    759     IMPORTANT: this has to be deleted from the outside
     765 * @param fileName the Name of the File to check
     766 * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
     767 *  IMPORTANT: this has to be deleted from the outside
    760768*/
    761769char* ResourceManager::getFullName(const char* fileName)
    … …  
    778786
    779787/**
    780  *  outputs debug information about the ResourceManager
     788 * outputs debug information about the ResourceManager
    781789*/
    782790void ResourceManager::debug() const
    … …  
    824832        case WAV:
    825833          PRINT(0)("SoundFile\n");
     834          break;
     835        case OGG:
     836          PRINT(0)("MusicFile\n");
     837          break;
    826838#endif
    827839        default:
Note: See TracChangeset for help on using the changeset viewer.