Changeset 414 for libmpc/trunk/mpcchap/mpcchap.c

Timestamp:

11/02/08 01:21:42 (16 years ago)

Author:

r2d

Message:

changes to make mpcchap build with msvc

File:

• libmpc/trunk/mpcchap/mpcchap.c (modified) (13 diffs)

libmpc/trunk/mpcchap/mpcchap.c

@@ -38 +38 @@
 
 #ifdef _MSC_VER
-#define atoll _atoi64
+# include <io.h>
+# define atoll          _atoi64
+# define ftruncate      chsize
+# define strcasecmp stricmp
 #endif
 
@@ -66 +69 @@
         struct stat stbuf;
         FILE * in_file;
-        int chap_pos, end_pos, chap_size, i;
+        int chap_pos, end_pos, chap_size, i, nchap;
+        char * tmp_buff;
+        dictionary * dict;
 
         chap_pos = (demux->chap_pos >> 3) + si->header_position;
@@ -73 +78 @@
 
         stat(mpc_file, &stbuf);
-        char * tmp_buff = malloc(stbuf.st_size - chap_pos - chap_size);
+        tmp_buff = malloc(stbuf.st_size - chap_pos - chap_size);
         in_file = fopen( mpc_file, "r+b" );
         fseek(in_file, chap_pos + chap_size, SEEK_SET);
@@ -79 +84 @@
         fseek(in_file, chap_pos, SEEK_SET);
 
-        dictionary * dict = iniparser_load(chap_file);
-
-        int nchap = iniparser_getnsec(dict);
+        dict = iniparser_load(chap_file);
+
+        nchap = iniparser_getnsec(dict);
         for (i = 0; i < nchap; i++) {
-                int j, nitem, ntags = 0, tag_len = 0;
+                int j, nitem, ntags = 0, tag_len = 0, offset_size;
                 mpc_uint16_t gain = 0, peak = 0;
-                char * chap_sec = iniparser_getsecname(dict, i);
+                char * chap_sec = iniparser_getsecname(dict, i), block_header[12] = "CT", sample_offset[10];
                 mpc_int64_t chap_pos = atoll(chap_sec);
 
@@ -112 +117 @@
                 }
                 if (ntags > 0) tag_len += 24 + ntags * 9;
-                char block_header[12] = "CT";
-                char sample_offset[10];
-                int offset_size = encodeSize(chap_pos, sample_offset, MPC_FALSE);
+                
+                offset_size = encodeSize(chap_pos, sample_offset, MPC_FALSE);
                 tag_len = encodeSize(tag_len + 4 + offset_size + 2, block_header + 2, MPC_TRUE);
                 fwrite(block_header, 1, tag_len + 2, in_file);
@@ -143 +147 @@
         FILE * in_file;
         int chap_pos, end_pos, chap_size, i;
+        char * tmp_buff;
 
         if (0 == (cd = cf_parse(chap_file, &format))) {
@@ -154 +159 @@
 
         stat(mpc_file, &stbuf);
-        char * tmp_buff = malloc(stbuf.st_size - chap_pos - chap_size);
+        tmp_buff = malloc(stbuf.st_size - chap_pos - chap_size);
         in_file = fopen( mpc_file, "r+b" );
         fseek(in_file, chap_pos + chap_size, SEEK_SET);
@@ -162 +167 @@
         nchap = cd_get_ntrack(cd);
         for (i = 1; i <= nchap; i++) {
-                int j, nitem = 0, tag_len = 0, key_len, item_len;
+                char track_buf[16], block_header[12] = "CT", sample_offset[10];
+                int j, nitem = 0, tag_len = 0, key_len, item_len, offset_size;
                 Track * track;
                 Cdtext *cdtext;
+                mpc_int64_t chap_pos;
 
                 track = cd_get_track (cd, i);
@@ -170 +177 @@
 
                 // position du chapitre
-                mpc_int64_t chap_pos = (mpc_int64_t) si->sample_freq * track_get_start (track) / 75;
+                chap_pos = (mpc_int64_t) si->sample_freq * track_get_start (track) / 75;
 
                 if (chap_pos > si->samples - si->beg_silence)
@@ -178 +185 @@
                 Init_Tags();
 
-                char track_buf[16];
                 sprintf(track_buf, "%i/%i", i, nchap);
                 key_len = 5;
@@ -199 +205 @@
 
                 tag_len += 24 + nitem * 9;
-                char block_header[12] = "CT";
-                char sample_offset[10];
-                int offset_size = encodeSize(chap_pos, sample_offset, MPC_FALSE);
+                offset_size = encodeSize(chap_pos, sample_offset, MPC_FALSE);
                 tag_len = encodeSize(tag_len + 4 + offset_size + 2, block_header + 2, MPC_TRUE);
                 fwrite(block_header, 1, tag_len + 2, in_file);
@@ -262 +266 @@
         mpc_status err;
         FILE * test_file;
+        int chap_nb;
 
         if (argc != 3)
@@ -281 +286 @@
         }
 
-        int chap_nb = mpc_demux_chap_nb(demux);
+        chap_nb = mpc_demux_chap_nb(demux);
 
         test_file = fopen(chap_file, "rb" );