Changeset 2:422f3cb3614b

Timestamp:

08/01/08 21:17:15 (4 years ago)

Author:

thib

Branch:

default

convert_revision:

svn:d0a2da98-017c-47d2-8c43-22b54484806d/trunk@3

Message:

Enabled voice playing with "%04d/%04d%05d.ogg" format. Don't use a cache for this

Location:

music2

Files:

• koedec.cc (modified) (4 diffs)
• koedec_ogg.cc (modified) (1 diff)
• music.h (modified) (1 diff)

music2/koedec.cc

@@ -34 +34 @@
 #include"music.h"
 #include"system/file.h"
+#include"system/file_impl.h"
 
 using namespace std;
@@ -86 +87 @@
         return koe_cache.Find(file_number, index);
 };
-
+extern int ogg_get_rate(FILE*);
 AvgKoeInfo AvgKoeCache::Find(int file_number, int index) {
         AvgKoeInfo info;
@@ -109 +110 @@
                         arcinfo = file_searcher.Find(FILESEARCH::KOE,fname,".ovk");
                 }
+                if (arcinfo == 0) {
+                        DIRFILE* koedir = (DIRFILE*) file_searcher.MakeARCFILE((FILESEARCH::ARCTYPE)0, "koe");
+                        sprintf(fname, "%04d", file_number);
+                        koedir = new DIRFILE(koedir->SearchFile(fname));
+                        sprintf(fname, "z%04d%05d.ogg", file_number, index);
+                        arcinfo = koedir->Find(fname, ".ogg");
+                        delete koedir;
+                        
+                        if (arcinfo == 0) return info;
+                        FILE* stream = arcinfo->OpenFile();
+                        info.rate = ogg_get_rate(stream);
+                        fseek(stream, 0L, SEEK_END);
+                        info.length = ftell(stream);
+                        fseek(stream, 0L, SEEK_CUR);
+                        info.type = koe_ogg;
+                        info.stream = stream;
+                        return info;
+                }
                 if (arcinfo == 0) return info;
                 FILE* stream = arcinfo->OpenFile();
@@ -142 +161 @@
         type = from.type;
 }
+
 AvgKoeHead::AvgKoeHead(FILE* _s, int _file_number, KoeType _type) {
         char head[0x20];

music2/koedec_ogg.cc

@@ -99 +99 @@
         return 0;
 }
+int ogg_get_rate(FILE *stream)
+{
+        OggVorbis_File vf;
+        ov_open(stream, &vf, NULL, 0);
+        return vf.vi->rate;
+}
 
 extern char* decode_koe_ogg(AvgKoeInfo info, int* dest_len) {

music2/music.h

@@ -16 +16 @@
 #define DEFAULT_AUDIOBUF        4096
 
-enum KoeType { koe_unknown, koe_nwk, koe_ovk};
+enum KoeType { koe_unknown, koe_nwk, koe_ovk, koe_ogg};
 typedef struct {
         FILE* stream;