Mercurial > hg > audiodb
comparison common.cpp @ 277:abfb26e08d9c audiodb-debian
Merge trunk changes -r326:386 into audiodb-debian branch.
Plus new debian/changelog version. (Should have used an epoch really,
but couldn't be bothered; TODO: work out a sane version numbering
policy).
author | mas01cr |
---|---|
date | Tue, 01 Jul 2008 09:12:40 +0000 |
parents | 15b8ff55ea5b |
children | dee55886eca0 |
comparison
equal
deleted
inserted
replaced
246:cbf51690c78c | 277:abfb26e08d9c |
---|---|
113 dataBufLength = dbH->timesTableOffset - dbH->dataOffset; | 113 dataBufLength = dbH->timesTableOffset - dbH->dataOffset; |
114 timesTableLength = dbH->powerTableOffset - dbH->timesTableOffset; | 114 timesTableLength = dbH->powerTableOffset - dbH->timesTableOffset; |
115 powerTableLength = dbH->l2normTableOffset - dbH->powerTableOffset; | 115 powerTableLength = dbH->l2normTableOffset - dbH->powerTableOffset; |
116 l2normTableLength = dbH->dbSize - dbH->l2normTableOffset; | 116 l2normTableLength = dbH->dbSize - dbH->l2normTableOffset; |
117 } else { | 117 } else { |
118 fileTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLESIZE); | 118 fileTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE); |
119 trackTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_TRACKTABLESIZE); | 119 trackTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_TRACKTABLE_ENTRY_SIZE); |
120 dataBufLength = ALIGN_PAGE_UP(dbH->length); | 120 dataBufLength = ALIGN_PAGE_UP(dbH->length); |
121 timesTableLength = ALIGN_PAGE_UP(2*(dbH->length / dbH->dim)); | 121 timesTableLength = ALIGN_PAGE_UP(2*(dbH->length / dbH->dim)); |
122 powerTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); | 122 powerTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); |
123 l2normTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); | 123 l2normTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); |
124 } | 124 } |