From patchwork Sat Apr 29 10:03:28 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Artur Skawina <art_k@o2.pl>
X-Patchwork-Id: 12285
Received: from dlm51.neoplus.adsl.tpnet.pl ([83.24.42.51] helo=unknown.box)
	by www.linuxtv.org with smtp (Exim 4.50) id 1FZmIy-0001Ig-V3
	for vdr@linuxtv.org; Sat, 29 Apr 2006 12:04:01 +0200
Received: (qmail 14775 invoked from network); 29 Apr 2006 10:03:29 -0000
Received: from unknown (HELO ?172.19.43.221?) (172.19.43.221)
	by 172.19.43.250 with SMTP; 29 Apr 2006 10:03:29 -0000
Message-ID: <445339F0.5030502@o2.pl>
Date: Sat, 29 Apr 2006 12:03:28 +0200
From: Artur Skawina <art_k@o2.pl>
User-Agent: Mail/News 3.0a1 (X11/20060416)
MIME-Version: 1.0
To: VDR Mailing List <vdr@linuxtv.org>
Subject: Re: [vdr] [ANNOUNCE] VDR developer version 1.3.49
References: <44521D96.3060101@cadsoft.de>
In-Reply-To: <44521D96.3060101@cadsoft.de>
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Apr 2006 10:04:01 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 9131

Klaus Schmidinger wrote:
> VDR developer version 1.3.49 is now available at

> If there are no more serious bugs, this will become the final
> version 1.4.0 this sunday :-)

looking through local changes, i think this is the only one obviously-correct enough
-- i got +/- wrong when calculating the size; should be mostly harmless anyway (was
just calling fadvise with too large area).

diff -urNp vdr-1.3.49.org/tools.c vdr-1.3.49.min/tools.c
--- vdr-1.3.49.org/tools.c	2006-04-21 15:12:47.000000000 +0000
+++ vdr-1.3.49.min/tools.c	2006-04-29 09:10:26.000000000 +0000
@@ -1179,7 +1179,7 @@ ssize_t cUnbufferedFile::Read(void *Data
            }
         else if (cachedend > ahead && cachedend - curpos > READCHUNK * 2) {
            // current position has moved back enough, shrink head window.
-           FadviseDrop(curpos + READCHUNK, cachedend - curpos + READCHUNK);
+           FadviseDrop(curpos + READCHUNK, cachedend - (curpos + READCHUNK));
            cachedend = curpos + READCHUNK;
            }
         }