X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fwavecache.C;h=d8c34e14d2d339dec54768bb3d4855f124de819b;hb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;hp=ffeeed60b4c6c727d37ffe7bdf904fa498f6a6b0;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/wavecache.C b/cinelerra-5.1/cinelerra/wavecache.C index ffeeed60..d8c34e14 100644 --- a/cinelerra-5.1/cinelerra/wavecache.C +++ b/cinelerra-5.1/cinelerra/wavecache.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "cstrdup.h" @@ -60,11 +60,11 @@ WaveCacheItem* WaveCache::get_wave(int indexable_id, { lock->lock("WaveCache::get_wave"); WaveCacheItem *result = 0; - + result = (WaveCacheItem*)get_item(start); while(result && result->position == start) { - if(result->indexable_id == indexable_id && + if(result->indexable_id == indexable_id && result->channel == channel && result->end == end) { @@ -74,7 +74,7 @@ WaveCacheItem* WaveCache::get_wave(int indexable_id, else result = (WaveCacheItem*)result->next; } - + lock->unlock(); return 0; } @@ -95,7 +95,7 @@ void WaveCache::put_wave(Indexable *indexable, item->end = end; item->high = high; item->low = low; - + put_item(item); lock->unlock(); }