Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2008, 12:22:42 AM (16 years ago)
Author:
rgrieder
Message:

Merged r2101 (objecthierarchy) to trunk.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • code/trunk/src/audio/AudioBuffer.cc

    r1784 r2103  
    3131namespace audio
    3232{
    33     AudioBuffer::AudioBuffer(std::string fileName)
     33    AudioBuffer::AudioBuffer(std::string filename)
    3434    {
    3535        // Load wav data into buffers.
     
    4040
    4141        //FIXME deprecated; seems unneeded
    42 //        alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
     42//        alutLoadWAVFile((ALbyte*)filename.c_str(), &format, &data, &size, &freq, &loop);
    4343        alBufferData(buffer, format, data, size, freq);
    4444        //FIXME deprecated; seems unneeded
Note: See TracChangeset for help on using the changeset viewer.