comparison audioDB.cpp @ 381:9742ea0ac33d

API const correctness. The char *path arguments to audiodb_open() and audiodb_create() should be const; make it so. Also arrange for the datasize, ntracks and datadim arguments to audiodb_create() to be unsigned to match the fields in the internal audioDB class. Technically this is an ABI change, but since nothing is calling this function with anything other than zero arguments yet (correct me if I'm wrong) no-one should notice. (If you notice, shout)
author mas01cr
date Fri, 21 Nov 2008 14:32:27 +0000
parents cfc55df37ceb
children 8425d05eda33
comparison
equal deleted inserted replaced
380:7d6dd067d12e 381:9742ea0ac33d
905 * Christophe Rhodes c.rhodes@gold.ac.uk 905 * Christophe Rhodes c.rhodes@gold.ac.uk
906 * Ian Knopke mas01ik@gold.ac.uk, ian.knopke@gmail.com */ 906 * Ian Knopke mas01ik@gold.ac.uk, ian.knopke@gmail.com */
907 907
908 #include "audioDB_API.h" 908 #include "audioDB_API.h"
909 909
910 910 adb_ptr audiodb_create(const char *path, unsigned datasize, unsigned ntracks, unsigned datadim) {
911 //adb_ptr audiodb_create(char * path,long ntracks, long datadim) {
912 adb_ptr audiodb_create(char * path,long datasize,long ntracks, long datadim) {
913 const char *argv[12]; 911 const char *argv[12];
914 int argvctr=0; 912 int argvctr=0;
915 char tempstr1[200]; 913 char tempstr1[200];
916 char tempstr2[200]; 914 char tempstr2[200];
917 char tempstr3[200]; 915 char tempstr3[200];
923 argv[argvctr++] = "-d"; 921 argv[argvctr++] = "-d";
924 argv[argvctr++] = path; 922 argv[argvctr++] = path;
925 923
926 if (datasize >0){ 924 if (datasize >0){
927 argv[argvctr++]="--datasize"; 925 argv[argvctr++]="--datasize";
928 snprintf(tempstr1,sizeof(tempstr1),"%ld",datasize); 926 snprintf(tempstr1,sizeof(tempstr1),"%u",datasize);
929 argv[argvctr++]=tempstr1; 927 argv[argvctr++]=tempstr1;
930 } 928 }
931 929
932 if (ntracks >0){ 930 if (ntracks >0){
933 argv[argvctr++]="--ntracks"; 931 argv[argvctr++]="--ntracks";
934 snprintf(tempstr2,sizeof(tempstr2),"%ld",ntracks); 932 snprintf(tempstr2,sizeof(tempstr2),"%u",ntracks);
935 argv[argvctr++]=tempstr2; 933 argv[argvctr++]=tempstr2;
936 } 934 }
937 935
938 if (datadim > 0){ 936 if (datadim > 0){
939 argv[argvctr++]="--datadim"; 937 argv[argvctr++]="--datadim";
940 snprintf(tempstr3,sizeof(tempstr3),"%ld",datadim); 938 snprintf(tempstr3,sizeof(tempstr3),"%u",datadim);
941 argv[argvctr++]=tempstr3; 939 argv[argvctr++]=tempstr3;
942 } 940 }
943 941
944 argv[argvctr+1]='\0'; 942 argv[argvctr+1]='\0';
945 943
1308 1306
1309 audioDB::audioDB(4,argv,&apierror); 1307 audioDB::audioDB(4,argv,&apierror);
1310 return apierror; 1308 return apierror;
1311 } 1309 }
1312 1310
1313 adb_ptr audiodb_open(char * path){ 1311 adb_ptr audiodb_open(const char *path){
1314 1312
1315 adb_ptr mydbp; 1313 adb_ptr mydbp;
1316 adbstatus mystatus; 1314 adbstatus mystatus;
1317 1315
1318 /* if db exists */ 1316 /* if db exists */