Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed all u_int64_t to int64_t. Some crappy MS compilers obviously cannot convert u_int64_t to double. And I do not need them that badly.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-04-13 15:23:03 +00:00
parent 38421dcd09
commit 36a29fd086
33 changed files with 104 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkvinfo.cpp
View File

@ -12,7 +12,7 @@
/*!
\file
\version \$Id: mkvinfo.cpp,v 1.6 2003/04/13 14:00:54 mosu Exp $
\version \$Id: mkvinfo.cpp,v 1.7 2003/04/13 15:23:02 mosu Exp $
\brief retrieves and displays information about a Matroska file
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -69,7 +69,7 @@ using namespace LIBMATROSKA_NAMESPACE;
typedef struct track_t {
int tnum;
char type;
u_int64_t size;
int64_t size;
} track_t;
track_t **tracks = NULL;
@ -148,7 +148,7 @@ void process_file() {
// Elements for different levels
EbmlElement *l0 = NULL, *l1 = NULL, *l2 = NULL, *l3 = NULL, *l4 = NULL;
EbmlStream *es;
u_int64_t last_pos;
int64_t last_pos;
u_int32_t cluster_tc;
try {

6
mkvmerge.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: mkvmerge.cpp,v 1.29 2003/04/13 14:00:54 mosu Exp $
\version \$Id: mkvmerge.cpp,v 1.30 2003/04/13 15:23:02 mosu Exp $
\brief command line parameter parsing, looping, output handling
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -171,7 +171,7 @@ static void usage(void) {
static int get_type(char *filename) {
FILE *f = fopen(filename, "r");
u_int64_t size;
int64_t size;
if (f == NULL) {
fprintf(stderr, "Error: could not open source file (%s).\n", filename);
@ -723,7 +723,7 @@ static void parse_args(int argc, char **argv) {
}
static int write_packet(packet_t *pack) {
u_int64_t timecode;
int64_t timecode;
cluster_helper->add_packet(pack);
timecode = cluster_helper->get_timecode();

8
p_ac3.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_ac3.cpp,v 1.8 2003/04/11 10:32:31 mosu Exp $
\version \$Id: p_ac3.cpp,v 1.9 2003/04/13 15:23:02 mosu Exp $
\brief AC3 output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -200,7 +200,7 @@ int ac3_packetizer_c::process(unsigned char *buf, int size,
unsigned char *packet;
unsigned long header;
ac3_header_t ac3header;
u_int64_t my_timecode;
int64_t my_timecode;
if (timecode != -1)
my_timecode = timecode;
@ -208,8 +208,8 @@ int ac3_packetizer_c::process(unsigned char *buf, int size,
add_to_buffer(buf, size);
while ((packet = get_ac3_packet(&header, &ac3header)) != NULL) {
if (timecode != -1)
my_timecode = (u_int64_t)(1000.0 * packetno * 1536 * ti->async.linear /
samples_per_sec);
my_timecode = (int64_t)(1000.0 * packetno * 1536 * ti->async.linear /
samples_per_sec);
add_packet(packet, ac3header.bytes, my_timecode);
packetno++;

4
p_ac3.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_ac3.h,v 1.8 2003/04/11 10:36:55 mosu Exp $
\version \$Id: p_ac3.h,v 1.9 2003/04/13 15:23:02 mosu Exp $
\brief class definition for the AC3 output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -27,7 +27,7 @@
class ac3_packetizer_c: public q_c {
private:
u_int64_t bytes_output, packetno;
int64_t bytes_output, packetno;
unsigned long samples_per_sec;
int channels;
unsigned char *packet_buffer;

8
p_mp3.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_mp3.cpp,v 1.9 2003/04/11 11:19:30 mosu Exp $
\version \$Id: p_mp3.cpp,v 1.10 2003/04/13 15:23:02 mosu Exp $
\brief MP3 output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -196,7 +196,7 @@ int mp3_packetizer_c::process(unsigned char *buf, int size,
unsigned char *packet;
unsigned long header;
mp3_header_t mp3header;
u_int64_t my_timecode;
int64_t my_timecode;
if (timecode != -1)
my_timecode = timecode;
@ -210,8 +210,8 @@ int mp3_packetizer_c::process(unsigned char *buf, int size,
}
if (timecode == -1)
my_timecode = (u_int64_t)(1000.0 * packetno * 1152 * ti->async.linear /
samples_per_sec);
my_timecode = (int64_t)(1000.0 * packetno * 1152 * ti->async.linear /
samples_per_sec);
add_packet(packet, mp3header.framesize + 4, my_timecode);
packetno++;

4
p_mp3.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_mp3.h,v 1.8 2003/04/11 11:19:49 mosu Exp $
\version \$Id: p_mp3.h,v 1.9 2003/04/13 15:23:02 mosu Exp $
\brief class definition for the MP3 output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -27,7 +27,7 @@
class mp3_packetizer_c: public q_c {
private:
u_int64_t bytes_output, packetno;
int64_t bytes_output, packetno;
unsigned long samples_per_sec;
int channels;
unsigned char *tempbuf, *packet_buffer;

4
p_pcm.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_pcm.h,v 1.9 2003/04/11 11:21:10 mosu Exp $
\version \$Id: p_pcm.h,v 1.10 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the PCM output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -28,7 +28,7 @@ class pcm_packetizer_c: public q_c {
private:
int packetno;
int bps, channels, bits_per_sample;
u_int64_t bytes_output, remaining_sync;
int64_t bytes_output, remaining_sync;
unsigned long samples_per_sec;
unsigned char *tempbuf;
int tempbuf_size;

6
p_video.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_video.cpp,v 1.16 2003/04/11 11:27:14 mosu Exp $
\version \$Id: p_video.cpp,v 1.17 2003/04/13 15:23:03 mosu Exp $
\brief video output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -104,12 +104,12 @@ void video_packetizer_c::set_header() {
int video_packetizer_c::process(unsigned char *buf, int size,
int64_t old_timecode, int64_t flags) {
u_int64_t timecode;
int64_t timecode;
int key, num_frames;
num_frames = flags & VNUMFRAMES;
if (old_timecode == -1)
timecode = (u_int64_t)(1000.0 * frames_output / fps);
timecode = (int64_t)(1000.0 * frames_output / fps);
else
timecode = old_timecode;

4
p_video.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_video.h,v 1.16 2003/04/11 11:27:32 mosu Exp $
\version \$Id: p_video.h,v 1.17 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the video output module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -34,7 +34,7 @@ private:
double fps;
int width, height, bpp, packetno;
int frames_output, avi_compat_mode;
u_int64_t last_id;
int64_t last_id;
public:
video_packetizer_c(double nfps, int nwidth, int nheight, int nbpp,

6
p_vorbis.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_vorbis.cpp,v 1.7 2003/04/11 11:29:01 mosu Exp $
\version \$Id: p_vorbis.cpp,v 1.8 2003/04/13 15:23:03 mosu Exp $
\brief Vorbis packetizer
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -175,7 +175,7 @@ int vorbis_packetizer_c::process(unsigned char *data, int size,
int64_t timecode, int64_t) {
unsigned char zero[2];
ogg_packet op;
u_int64_t this_bs, samples_here, samples_needed;
int64_t this_bs, samples_here, samples_needed;
// Recalculate the timecode if needed.
if (timecode == -1)
@ -226,7 +226,7 @@ int vorbis_packetizer_c::process(unsigned char *data, int size,
if (timecode < 0)
return EMOREDATA;
add_packet(data, size, (u_int64_t)timecode);
add_packet(data, size, (int64_t)timecode);
return EMOREDATA;
}

4
p_vorbis.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: p_vorbis.h,v 1.6 2003/04/11 11:29:15 mosu Exp $
\version \$Id: p_vorbis.h,v 1.7 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the Vorbis packetizer
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -34,7 +34,7 @@
class vorbis_packetizer_c: public q_c {
private:
u_int64_t last_bs, samples;
int64_t last_bs, samples;
int packetno;
audio_sync_t async;
vorbis_info vi;

18
pr_generic.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: pr_generic.cpp,v 1.10 2003/03/05 13:51:20 mosu Exp $
\version \$Id: pr_generic.cpp,v 1.11 2003/04/13 15:23:03 mosu Exp $
\brief functions common for all readers/packetizers
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -122,7 +122,7 @@ void cluster_helper_c::add_packet(packet_t *packet) {
walk_clusters();
}
u_int64_t cluster_helper_c::get_timecode() {
int64_t cluster_helper_c::get_timecode() {
if (clusters == NULL)
return 0;
if (clusters[num_clusters - 1]->packets == NULL)
@ -187,7 +187,7 @@ int cluster_helper_c::render(IOCallback *out) {
KaxCues dummy_cues;
KaxCluster *cluster;
int i;
u_int64_t cluster_timecode;
int64_t cluster_timecode;
ch_contents_t *clstr;
packet_t *pack, *bref_packet, *fref_packet;
@ -198,9 +198,15 @@ int cluster_helper_c::render(IOCallback *out) {
clstr = clusters[num_clusters - 1];
cluster = clstr->cluster;
cluster_timecode = get_timecode();
if (verbose > 1)
fprintf(stdout, "cluster_helper_c::render: cluster_timecode %lld\n",
cluster_timecode);
for (i = 0; i < clstr->num_packets; i++) {
pack = clstr->packets[i];
if (verbose > 1)
fprintf(stdout, " cluster_helper_c::render: pack->timestamp %lld\n",
pack->timestamp);
pack->group = &cluster->GetNewBlock();
pack->data_buffer = new DataBuffer((binary *)pack->data, pack->length);
@ -245,7 +251,7 @@ int cluster_helper_c::render(IOCallback *out) {
return 1;
}
ch_contents_t *cluster_helper_c::find_packet_cluster(u_int64_t pid) {
ch_contents_t *cluster_helper_c::find_packet_cluster(int64_t pid) {
int i, k;
if (clusters == NULL)
@ -259,7 +265,7 @@ ch_contents_t *cluster_helper_c::find_packet_cluster(u_int64_t pid) {
return NULL;
}
packet_t *cluster_helper_c::find_packet(u_int64_t pid) {
packet_t *cluster_helper_c::find_packet(int64_t pid) {
int i, k;
if (clusters == NULL)
@ -367,7 +373,7 @@ int cluster_helper_c::free_clusters() {
return 1;
}
int cluster_helper_c::free_ref(u_int64_t pid, void *source) {
int cluster_helper_c::free_ref(int64_t pid, void *source) {
int i, k;
packet_t *p;

12
pr_generic.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: pr_generic.h,v 1.13 2003/04/11 11:29:28 mosu Exp $
\version \$Id: pr_generic.h,v 1.14 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the generic reader and packetizer
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -55,18 +55,18 @@ public:
void add_cluster(KaxCluster *cluster);
KaxCluster *get_cluster();
void add_packet(packet_t *packet);
u_int64_t get_timecode();
int64_t get_timecode();
packet_t *get_packet(int num);
int get_packet_count();
int render(IOCallback *out);
int free_ref(u_int64_t pid, void *source);
int free_ref(int64_t pid, void *source);
int free_clusters();
int get_cluster_content_size();
private:
int find_cluster(KaxCluster *cluster);
ch_contents_t *find_packet_cluster(u_int64_t pid);
packet_t *find_packet(u_int64_t pid);
ch_contents_t *find_packet_cluster(int64_t pid);
packet_t *find_packet(int64_t pid);
void free_contents(ch_contents_t *clstr);
void check_clusters(int num);
};
@ -109,7 +109,7 @@ typedef struct packet_t {
KaxCluster *cluster;
unsigned char *data;
int length, superseeded;
u_int64_t timestamp, id, bref, fref;
int64_t timestamp, id, bref, fref;
generic_packetizer_c *source;
} packet_t;

10
queue.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: queue.cpp,v 1.9 2003/03/05 13:51:20 mosu Exp $
\version \$Id: queue.cpp,v 1.10 2003/04/13 15:23:03 mosu Exp $
\brief packet queueing class used by every packetizer
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -31,7 +31,7 @@
#include <dmalloc.h>
#endif
u_int64_t q_c::id = 1;
int64_t q_c::id = 1;
q_c::q_c(track_info_t *nti) throw (error_c) : generic_packetizer_c(nti) {
first = NULL;
@ -54,9 +54,9 @@ q_c::~q_c() {
}
}
u_int64_t q_c::add_packet(unsigned char *data, int length,
u_int64_t timestamp, u_int64_t bref,
u_int64_t fref) {
int64_t q_c::add_packet(unsigned char *data, int length,
int64_t timestamp, int64_t bref,
int64_t fref) {
q_page_t *qpage;
if (data == NULL)

20
queue.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: queue.h,v 1.8 2003/03/05 13:51:20 mosu Exp $
\version \$Id: queue.h,v 1.9 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the queueing class
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -32,21 +32,21 @@ typedef struct q_page {
class q_c: public generic_packetizer_c {
private:
static u_int64_t id;
struct q_page *first, *current;
static int64_t id;
struct q_page *first, *current;
public:
q_c(track_info_t *nti) throw (error_c);
virtual ~q_c();
virtual u_int64_t add_packet(unsigned char *data, int lenth,
u_int64_t timestamp, u_int64_t bref = 0,
u_int64_t fref = 0);
virtual packet_t *get_packet();
virtual int packet_available();
virtual stamp_t get_smallest_timestamp();
virtual int64_t add_packet(unsigned char *data, int lenth,
int64_t timestamp, int64_t bref = 0,
int64_t fref = 0);
virtual packet_t *get_packet();
virtual int packet_available();
virtual stamp_t get_smallest_timestamp();
virtual long get_queued_bytes();
virtual long get_queued_bytes();
};
#endif // __QUEUE_H

4
r_ac3.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_ac3.cpp,v 1.9 2003/04/11 11:30:18 mosu Exp $
\version \$Id: r_ac3.cpp,v 1.10 2003/04/13 15:23:03 mosu Exp $
\brief AC3 demultiplexer module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -37,7 +37,7 @@ extern "C" {
#include <dmalloc.h>
#endif
int ac3_reader_c::probe_file(FILE *file, u_int64_t size) {
int ac3_reader_c::probe_file(FILE *file, int64_t size) {
char buf[4096];
int pos;
ac3_header_t ac3header;

7
r_ac3.h
View File

@ -13,7 +13,7 @@
/*!
\file r_avi.h
\version \$Id: r_ac3.h,v 1.6 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_ac3.h,v 1.7 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the AVI demultiplexer module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -34,8 +34,7 @@ private:
unsigned char *chunk;
FILE *file;
class ac3_packetizer_c *ac3packetizer;
u_int64_t bytes_processed;
u_int64_t size;
int64_t bytes_processed, size;
public:
ac3_reader_c(track_info_t *nti) throw (error_c);
@ -46,7 +45,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
};
#endif // __R_AC3_H

6
r_avi.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_avi.cpp,v 1.16 2003/04/11 11:36:18 mosu Exp $
\version \$Id: r_avi.cpp,v 1.17 2003/04/13 15:23:03 mosu Exp $
\brief AVI demultiplexer module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -40,7 +40,7 @@ extern "C" {
#include <dmalloc.h>
#endif
int avi_reader_c::probe_file(FILE *file, u_int64_t size) {
int avi_reader_c::probe_file(FILE *file, int64_t size) {
unsigned char data[12];
if (size < 12)
@ -64,7 +64,7 @@ int avi_reader_c::probe_file(FILE *file, u_int64_t size) {
avi_reader_c::avi_reader_c(track_info_t *nti) throw (error_c):
generic_reader_c(nti) {
int fsize, i;
u_int64_t size;
int64_t size;
FILE *f;
int extract_video = 1;
avi_demuxer_t *demuxer;

6
r_avi.h
View File

@ -13,7 +13,7 @@
/*!
\file r_avi.h
\version \$Id: r_avi.h,v 1.10 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_avi.h,v 1.11 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the AVI demultiplexer module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -41,7 +41,7 @@ typedef struct avi_demuxer_t {
int channels, bits_per_sample, samples_per_second;
int aid;
int eos;
u_int64_t bytes_processed;
int64_t bytes_processed;
avi_demuxer_t *next;
} avi_demuxer_t;
@ -68,7 +68,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
private:
virtual int add_audio_demuxer(avi_t *avi, int aid);

4
r_matroska.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_matroska.cpp,v 1.1 2003/04/11 10:03:16 mosu Exp $
\version \$Id: r_matroska.cpp,v 1.2 2003/04/13 15:23:03 mosu Exp $
\brief Matroska reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -67,7 +67,7 @@ using namespace LIBMATROSKA_NAMESPACE;
* Probes a file by simply comparing the first four bytes to the EBML
* head signature.
*/
int mkv_reader_c::probe_file(FILE *file, u_int64_t size) {
int mkv_reader_c::probe_file(FILE *file, int64_t size) {
unsigned char data[4];
if (size < 4)

8
r_matroska.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_matroska.h,v 1.1 2003/04/11 10:03:16 mosu Exp $
\version \$Id: r_matroska.h,v 1.2 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the Matroska reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -63,7 +63,7 @@ typedef struct {
unsigned char *headers[3];
u_int32_t header_sizes[3];
u_int64_t units_processed;
int64_t units_processed;
int ok;
@ -77,7 +77,7 @@ private:
mkv_track_t **tracks;
int num_tracks;
u_int64_t tc_scale;
int64_t tc_scale;
u_int32_t cluster_tc;
StdIOCallback *in;
@ -95,7 +95,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
private:
virtual int demuxing_requested(mkv_track_t *t);

2
r_microdvd.cpp
View File

@ -32,7 +32,7 @@
#include <dmalloc.h>
#endif
int microdvd_reader_c::probe_file(FILE *file, u_int64_t size) {
int microdvd_reader_c::probe_file(FILE *file, int64_t size) {
char chunk[2048];
int i;

2
r_microdvd.h
View File

@ -46,7 +46,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
};
#endif // __R_MICRODVD_H

4
r_mp3.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_mp3.cpp,v 1.8 2003/04/11 11:37:41 mosu Exp $
\version \$Id: r_mp3.cpp,v 1.9 2003/04/13 15:23:03 mosu Exp $
\brief MP3 reader module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -33,7 +33,7 @@
#include <dmalloc.h>
#endif
int mp3_reader_c::probe_file(FILE *file, u_int64_t size) {
int mp3_reader_c::probe_file(FILE *file, int64_t size) {
unsigned char buf[4096];
int pos;
unsigned long header;

6
r_mp3.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_mp3.h,v 1.7 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_mp3.h,v 1.8 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the MP3 reader module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -34,7 +34,7 @@ private:
unsigned char *chunk;
FILE *file;
class mp3_packetizer_c *mp3packetizer;
u_int64_t bytes_processed, size;
int64_t bytes_processed, size;
public:
mp3_reader_c(track_info_t *nti) throw (error_c);
@ -46,7 +46,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
};
#endif // __R_MP3_H

6
r_ogm.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_ogm.cpp,v 1.11 2003/04/11 11:52:57 mosu Exp $
\version \$Id: r_ogm.cpp,v 1.12 2003/04/13 15:23:03 mosu Exp $
\brief OGG media stream reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -52,7 +52,7 @@ extern "C" { // for BITMAPINFOHEADER
/*
* Probes a file by simply comparing the first four bytes to 'OggS'.
*/
int ogm_reader_c::probe_file(FILE *file, u_int64_t size) {
int ogm_reader_c::probe_file(FILE *file, int64_t size) {
unsigned char data[4];
if (size < 4)
@ -75,7 +75,7 @@ int ogm_reader_c::probe_file(FILE *file, u_int64_t size) {
*/
ogm_reader_c::ogm_reader_c(track_info_t *nti) throw (error_c):
generic_reader_c(nti) {
u_int64_t size;
int64_t size;
if ((file = fopen(ti->fname, "r")) == NULL)
throw error_c("ogm_reader: Could not open source file.");

4
r_ogm.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_ogm.h,v 1.9 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_ogm.h,v 1.10 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the OGG media stream reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -71,7 +71,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
private:
virtual ogm_demuxer_t *find_demuxer(int serialno);

4
r_srt.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_srt.cpp,v 1.4 2003/03/06 23:39:40 mosu Exp $
\version \$Id: r_srt.cpp,v 1.5 2003/04/13 15:23:03 mosu Exp $
\brief Subripper subtitle reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -45,7 +45,7 @@
#define issrttimestamp(s) (istimestamp(s) && isarrow(s + 12) && \
istimestamp(s + 17))
int srt_reader_c::probe_file(FILE *file, u_int64_t size) {
int srt_reader_c::probe_file(FILE *file, int64_t size) {
char chunk[2048];
if (fseek(file, 0, SEEK_SET) != 0)

4
r_srt.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_srt.h,v 1.6 2003/03/06 23:39:40 mosu Exp $
\version \$Id: r_srt.h,v 1.7 2003/04/13 15:23:03 mosu Exp $
\brief class definition for the Subripper subtitle reader
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -45,7 +45,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
};
#endif // __R_SRT_H

2
r_vobsub.cpp
View File

@ -57,7 +57,7 @@
iscommafileposstr(s + 23) && \
isfilepos(s + 34))
int vobsub_reader_c::probe_file(FILE *file, u_int64_t size) {
int vobsub_reader_c::probe_file(FILE *file, int64_t size) {
char chunk[2048];
if (fseek(file, 0, SEEK_SET) != 0)

2
r_vobsub.h
View File

@ -51,7 +51,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
private:
virtual void add_vobsub_packetizer(int width, int height,

6
r_wav.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_wav.cpp,v 1.7 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_wav.cpp,v 1.8 2003/04/13 15:23:03 mosu Exp $
\brief MP3 reader module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -37,7 +37,7 @@ extern "C" {
#include <dmalloc.h>
#endif
int wav_reader_c::probe_file(FILE *file, u_int64_t size) {
int wav_reader_c::probe_file(FILE *file, int64_t size) {
wave_header wheader;
if (size < sizeof(wave_header))
return 0;
@ -57,7 +57,7 @@ int wav_reader_c::probe_file(FILE *file, u_int64_t size) {
wav_reader_c::wav_reader_c(track_info_t *nti) throw (error_c):
generic_reader_c(nti) {
u_int64_t size;
int64_t size;
if ((file = fopen(ti->fname, "r")) == NULL)
throw error_c("wav_reader: Could not open source file.");

6
r_wav.h
View File

@ -14,7 +14,7 @@
/*!
\file
\version \$Id: r_wav.h,v 1.6 2003/03/05 13:51:20 mosu Exp $
\version \$Id: r_wav.h,v 1.7 2003/04/13 15:23:03 mosu Exp $
\brief class definitions for the WAV reader module
\author Moritz Bunkus <moritz @ bunkus.org>
*/
@ -41,7 +41,7 @@ private:
class pcm_packetizer_c *pcmpacketizer;
int bps;
struct wave_header wheader;
u_int64_t bytes_processed;
int64_t bytes_processed;
public:
wav_reader_c(track_info_t *nti) throw (error_c);
@ -53,7 +53,7 @@ public:
virtual int display_priority();
virtual void display_progress();
static int probe_file(FILE *file, u_int64_t size);
static int probe_file(FILE *file, int64_t size);
};
#endif // __R_WAV_H