mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-28 15:53:55 -04:00
search for MP3s as well
This commit is contained in:
parent
c94534b769
commit
bc362bc346
@ -7,6 +7,7 @@
|
|||||||
#include "audio_pool.h"
|
#include "audio_pool.h"
|
||||||
#include "config_audio.h"
|
#include "config_audio.h"
|
||||||
#include "audio_trait.h"
|
#include "audio_trait.h"
|
||||||
|
#include "config_util.h"
|
||||||
|
|
||||||
Configure(audio_load_mp3);
|
Configure(audio_load_mp3);
|
||||||
|
|
||||||
@ -445,6 +446,7 @@ AudioTraits::SoundClass* AudioLoadMp3(Filename) {
|
|||||||
EXPCL_MISC AudioTraits::SoundClass* AudioLoadMp3(Filename filename) {
|
EXPCL_MISC AudioTraits::SoundClass* AudioLoadMp3(Filename filename) {
|
||||||
unsigned char* buf;
|
unsigned char* buf;
|
||||||
unsigned long len;
|
unsigned long len;
|
||||||
|
filename.resolve_filename(get_sound_path());
|
||||||
read_file(filename, &buf, len);
|
read_file(filename, &buf, len);
|
||||||
if (buf != (unsigned char*)0L) {
|
if (buf != (unsigned char*)0L) {
|
||||||
return WinSample::load_raw(buf, len);
|
return WinSample::load_raw(buf, len);
|
||||||
@ -459,6 +461,7 @@ EXPCL_MISC AudioTraits::SoundClass* AudioLoadMp3(Filename filename) {
|
|||||||
AudioTraits::SoundClass* AudioLoadMp3(Filename filename) {
|
AudioTraits::SoundClass* AudioLoadMp3(Filename filename) {
|
||||||
unsigned char* buf;
|
unsigned char* buf;
|
||||||
unsigned long len;
|
unsigned long len;
|
||||||
|
filename.resolve_filename(get_sound_path());
|
||||||
read_file(filename, &buf, len);
|
read_file(filename, &buf, len);
|
||||||
if (buf != (unsigned char*)0L) {
|
if (buf != (unsigned char*)0L) {
|
||||||
return LinuxSample::load_raw(buf, len);
|
return LinuxSample::load_raw(buf, len);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user