[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    k3b_0_11_branch: kdeextragear-1/k3b/src/audiodecoding/mp3
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2004-12-16 7:28:49
Message-ID: 20041216072849.189051BA6D () office ! kde ! org
[Download RAW message or body]

CVS commit by trueg: 

BACKPORT: fixed mp3 file detection. :)


  M +11 -2     k3bmad.cpp   1.1.2.4
  M +2 -1      k3bmad.h   1.1.2.3


--- kdeextragear-1/k3b/src/audiodecoding/mp3/k3bmad.cpp  #1.1.2.3:1.1.2.4
@@ -185,5 +185,8 @@ bool K3bMad::seekFirstHeader()
   //
   bool headerFound = findNextHeader();
-  while( !headerFound && !m_inputFile.atEnd() && m_inputFile.at() < 50*1024 ) {
+  QIODevice::Offset inputPos = streamPos();
+  while( !headerFound && 
+         !m_inputFile.atEnd() && 
+         streamPos() <= inputPos+1024 ) {
     headerFound = findNextHeader();
   }
@@ -218,4 +221,10 @@ QIODevice::Offset K3bMad::inputPos() con
 
 
+QIODevice::Offset K3bMad::streamPos() const
+{
+  return inputPos() - (madStream->bufend - madStream->this_frame + 1);
+}
+
+
 bool K3bMad::inputSeek( QIODevice::Offset pos )
 {

--- kdeextragear-1/k3b/src/audiodecoding/mp3/k3bmad.h  #1.1.2.2:1.1.2.3
@@ -53,4 +53,5 @@ public:
   bool inputError() const;
   QIODevice::Offset inputPos() const;
+  QIODevice::Offset streamPos() const;
   bool inputSeek( QIODevice::Offset pos );
 


[prev in list] [next in list] [prev in thread] [next in thread]