From 47edc59c894ff8eb2a3c6e4703566c65703d3f91 Mon Sep 17 00:00:00 2001 From: nkorslund Date: Sun, 13 Jul 2008 13:52:46 +0000 Subject: [PATCH] minor fixes git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@25 ea6a568a-9f4f-0410-981a-c910a81bb256 --- COMPILE-linux.txt | 6 ++++-- sound/avcodec.d | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/COMPILE-linux.txt b/COMPILE-linux.txt index 4c6fdd7e8..0ce244e4d 100644 --- a/COMPILE-linux.txt +++ b/COMPILE-linux.txt @@ -39,7 +39,8 @@ Dependencies needed to build OpenMW: OGRE 1.4.5 (3d engine) OIS-1.0.0 (input system) OpenAL (3d sound system) -libavcodec (MP3 library) +libavcodec, + libavformat (For MP3 playback) gcc and g++ (C++ compiler) GNU make (build tool for C++ files) DMD 1.031 (D compiler) @@ -51,7 +52,8 @@ versions might work. OGRE, OIS and the other libraries have dependencies of their own, so I recommend using an automated package tool to install as many of these as possible. On ubuntu, try typing: -sudo apt-get install libogre-dev libavcodec-dev libois-dev build-essential g++ gdc +sudo apt-get install libogre-dev libavcodec-dev libavformat-dev libois-dev build-essential g++ gdc + If you want to install Ogre, OpenAL or OIS manually, try: OGRE: http://ogre3d.org/ diff --git a/sound/avcodec.d b/sound/avcodec.d index 8e3ae1221..e83d50b2f 100644 --- a/sound/avcodec.d +++ b/sound/avcodec.d @@ -1,3 +1,5 @@ +module sound.avcodec; + extern (C): // A unique handle that represents an AV file @@ -19,7 +21,7 @@ void cpp_closeAVFile(AVFile file); // Get a unique handle to an audio stream in the file. The given number // is for files that can contain multiple audio streams (generally you // would pass 0, for the first audio stream) -void *cpp_getAVAudioStream(AVFile file, int streamnum); +AVAudio cpp_getAVAudioStream(AVFile file, int streamnum); // Get audio info representing the current stream. Returns 0 for success // (not likely to fail)