Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / wavecache.C

diff --git a/cinelerra-5.0/cinelerra/wavecache.C b/cinelerra-5.0/cinelerra/wavecache.C
deleted file mode 100644 (file)
index ffeeed6..0000000
--- a/cinelerra-5.0/cinelerra/wavecache.C
+++ /dev/null
@@ -1,107 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
- * 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"
-#include "indexable.h"
-#include "mutex.h"
-#include "wavecache.h"
-
-#include <string.h>
-
-
-WaveCacheItem::WaveCacheItem()
- : CacheItemBase()
-{
-}
-
-WaveCacheItem::~WaveCacheItem()
-{
-}
-
-int WaveCacheItem::get_size()
-{
-       return sizeof(WaveCacheItem) + (path ? strlen(path) : 0);
-}
-
-
-
-WaveCache::WaveCache()
- : CacheBase()
-{
-}
-
-WaveCache::~WaveCache()
-{
-}
-
-
-WaveCacheItem* WaveCache::get_wave(int indexable_id,
-       int channel,
-       int64_t start,
-       int64_t end)
-{
-       lock->lock("WaveCache::get_wave");
-       WaveCacheItem *result = 0;
-       
-       result = (WaveCacheItem*)get_item(start);
-       while(result && result->position == start)
-       {
-               if(result->indexable_id == indexable_id && 
-                       result->channel == channel &&
-                       result->end == end)
-               {
-                       result->age = get_age();
-                       return result;
-               }
-               else
-                       result = (WaveCacheItem*)result->next;
-       }
-       
-       lock->unlock();
-       return 0;
-}
-
-void WaveCache::put_wave(Indexable *indexable,
-       int channel,
-       int64_t start,
-       int64_t end,
-       double high,
-       double low)
-{
-       lock->lock("WaveCache::put_wave");
-       WaveCacheItem *item = new WaveCacheItem;
-       item->indexable_id = indexable->id;
-       item->path = cstrdup(indexable->path);
-       item->channel = channel;
-       item->position = start;
-       item->end = end;
-       item->high = high;
-       item->low = low;
-       
-       put_item(item);
-       lock->unlock();
-}
-
-
-
-
-
-