Avoid repeating insert() operations in Ogg::File.

diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp
index 50a1c0b232f334fb87c3787bef089942825174b0..2a922981f41b6f938c243478b9aecf1ba6c5de8b 100644 (file)
--- a/taglib/ogg/oggfile.cpp
+++ b/taglib/ogg/oggfile.cpp
@@ -271,30 +271,14 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
 
   // Write the pages.
 
+  ByteVector data;
+  for(it = pages.begin(); it != pages.end(); ++it)
+    data.append((*it)->render());
+
   const unsigned long originalOffset = firstPage->fileOffset();
   const unsigned long originalLength = lastPage->fileOffset() + lastPage->size() - originalOffset;
 
-  unsigned long writtenLength = 0;
-
-  for(it = pages.begin(); it != pages.end(); ++it) {
-    const ByteVector data = (*it)->render();
-
-    unsigned long replace;
-
-    if(writtenLength + data.size() <= originalLength)
-      replace = data.size();
-    else if(writtenLength <= originalLength)
-      replace = originalLength - writtenLength;
-    else
-      replace = 0;
-
-    insert(data, originalOffset + writtenLength, replace);
-
-    writtenLength += data.size();
-  }
-
-  if(writtenLength < originalLength)
-    removeBlock(originalOffset + writtenLength, originalLength - writtenLength);
+  insert(data, originalOffset, originalLength);
 
   // Renumber the following pages if the pages have been split or merged.
 
@@ -302,7 +286,7 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
     = pages.back()->pageSequenceNumber() - lastPage->pageSequenceNumber();
 
   if(numberOfNewPages != 0) {
-    long pageOffset = originalOffset + writtenLength;
+    long pageOffset = originalOffset + data.size();
 
     while(true) {
       Page page(this, pageOffset);