Renamed Resources* classes to Resource* and renamed files

Naming classes like ResourcesItem or ResourcesDatabase is bad style,
therefore rename all classes and files to be Resource*.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
This commit is contained in:
Tobias Doerffel
2009-06-04 22:21:25 +02:00
parent 14fef9152c
commit ea2b165cbd
26 changed files with 471 additions and 471 deletions

View File

@@ -1,8 +1,8 @@
/*
* local_resources_provider.h - header file for LocalResourcesProvider
* LocalResourceProvider.h - header file for LocalResourceProvider
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,33 +22,33 @@
*
*/
#ifndef _LOCAL_RESOURCES_PROVIDER_H
#define _LOCAL_RESOURCES_PROVIDER_H
#ifndef _LOCAL_RESOURCE_PROVIDER_H
#define _LOCAL_RESOURCE_PROVIDER_H
#include <QtCore/QFileSystemWatcher>
#include <QtCore/QStringList>
#include "resources_provider.h"
#include "resources_item.h"
#include "ResourceProvider.h"
#include "ResourceItem.h"
class LocalResourcesProvider : public ResourcesProvider
class LocalResourceProvider : public ResourceProvider
{
Q_OBJECT
public:
LocalResourcesProvider( ResourcesItem::BaseDirectory _baseDir,
LocalResourceProvider( ResourceItem::BaseDirectory _baseDir,
const QString & _dir );
virtual ~LocalResourcesProvider();
virtual ~LocalResourceProvider();
virtual QString providerName( void ) const
{
return "LocalResourcesProvider";
return "LocalResourceProvider";
}
virtual void updateDatabase( void );
virtual int dataSize( const ResourcesItem * _item ) const;
virtual QByteArray fetchData( const ResourcesItem * _item,
virtual int dataSize( const ResourceItem * _item ) const;
virtual QByteArray fetchData( const ResourceItem * _item,
int _maxSize = -1 ) const;
virtual bool isLocal( void ) const
@@ -64,9 +64,9 @@ private slots:
private:
void readDir( const QString & _dir, ResourcesTreeItem * _parent );
void readDir( const QString & _dir, ResourceTreeItem * _parent );
ResourcesItem::BaseDirectory m_baseDir;
ResourceItem::BaseDirectory m_baseDir;
const QString m_dir;
QStringList m_scannedFolders;

View File

@@ -1,5 +1,5 @@
/*
* resources_browser.h - header file for ResourcesBrowser
* ResourceBrowser.h - header file for ResourceBrowser
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -23,19 +23,19 @@
*/
#ifndef _RESOURCES_BROWSER_H
#define _RESOURCES_BROWSER_H
#ifndef _RESOURCE_BROWSER_H
#define _RESOURCE_BROWSER_H
#include "side_bar_widget.h"
class QAction;
class QLabel;
class ResourcesItem;
class ResourcesTreeModel;
class ResourcesTreeView;
class ResourceItem;
class ResourceTreeModel;
class ResourceTreeView;
class ResourcesBrowser : public sideBarWidget
class ResourceBrowser : public sideBarWidget
{
Q_OBJECT
public:
@@ -53,8 +53,8 @@ public:
NumActions
} ;
ResourcesBrowser( QWidget * _parent );
virtual ~ResourcesBrowser();
ResourceBrowser( QWidget * _parent );
virtual ~ResourceBrowser();
private slots:
@@ -63,12 +63,12 @@ private slots:
private:
void triggerAction( Actions _action, ResourcesItem * _item );
void triggerAction( Actions _action, ResourceItem * _item );
QAction * m_actions[NumActions];
ResourcesTreeModel * m_treeModel;
ResourcesTreeView * m_treeView;
ResourceTreeModel * m_treeModel;
ResourceTreeView * m_treeView;
QLabel * m_filterStatusLabel;

View File

@@ -1,8 +1,8 @@
/*
* resources_db.h - header file for ResourcesDB
* ResourceDB.h - header file for ResourceDB
*
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,8 +22,8 @@
*
*/
#ifndef _RESOURCES_DB_H
#define _RESOURCES_DB_H
#ifndef _RESOURCE_DB_H
#define _RESOURCE_DB_H
#include <QtCore/QDateTime>
#include <QtCore/QHash>
@@ -31,25 +31,25 @@
#include <QtCore/QStringList>
#include <QtXml/QDomDocument>
#include "resources_tree_item.h"
#include "ResourceTreeItem.h"
class ResourcesDB : public QObject
class ResourceDB : public QObject
{
Q_OBJECT
public:
typedef QHash<QString, ResourcesItem *> ItemList;
typedef QHash<QString, ResourceItem *> ItemList;
ResourcesDB( ResourcesProvider * _provider );
~ResourcesDB();
ResourceDB( ResourceProvider * _provider );
~ResourceDB();
void init( void );
void load( const QString & _file );
void save( const QString & _file );
inline ResourcesProvider * provider( void )
inline ResourceProvider * provider( void )
{
return m_provider;
}
@@ -64,35 +64,35 @@ public:
return m_items;
}
inline ResourcesTreeItem * topLevelNode( void )
inline ResourceTreeItem * topLevelNode( void )
{
return &m_topLevelNode;
}
const ResourcesItem * nearestMatch( const ResourcesItem & _item );
const ResourceItem * nearestMatch( const ResourceItem & _item );
void addItem( ResourcesItem * newItem );
void addItem( ResourceItem * newItem );
void recursiveRemoveItems( ResourcesTreeItem * parent,
void recursiveRemoveItems( ResourceTreeItem * parent,
bool removeTopLevelParent = true );
private:
void saveTreeItem( const ResourcesTreeItem * _i, QDomDocument & _doc,
void saveTreeItem( const ResourceTreeItem * _i, QDomDocument & _doc,
QDomElement & _de );
void loadTreeItem( ResourcesTreeItem * _i, QDomElement & _de );
void loadTreeItem( ResourceTreeItem * _i, QDomElement & _de );
static inline QString typeName( ResourcesItem::Type _t )
static inline QString typeName( ResourceItem::Type _t )
{
return s_typeNames[_t];
}
static inline QString baseDirName( ResourcesItem::BaseDirectory _bd )
static inline QString baseDirName( ResourceItem::BaseDirectory _bd )
{
return s_baseDirNames[_bd];
}
static inline ResourcesItem::Type typeFromName( const QString & _n )
static inline ResourceItem::Type typeFromName( const QString & _n )
{
for( TypeStringMap::ConstIterator it = s_typeNames.begin();
it != s_typeNames.end(); ++it )
@@ -102,10 +102,10 @@ private:
return it.key();
}
}
return ResourcesItem::TypeUnknown;
return ResourceItem::TypeUnknown;
}
static inline ResourcesItem::BaseDirectory baseDirFromName(
static inline ResourceItem::BaseDirectory baseDirFromName(
const QString & _n )
{
for( BaseDirStringMap::ConstIterator it =
@@ -117,17 +117,17 @@ private:
return it.key();
}
}
return ResourcesItem::BaseRoot;
return ResourceItem::BaseRoot;
}
typedef QMap<ResourcesItem::Type, QString> TypeStringMap;
typedef QMap<ResourcesItem::BaseDirectory, QString> BaseDirStringMap;
typedef QMap<ResourceItem::Type, QString> TypeStringMap;
typedef QMap<ResourceItem::BaseDirectory, QString> BaseDirStringMap;
static TypeStringMap s_typeNames;
static BaseDirStringMap s_baseDirNames;
ResourcesProvider * m_provider;
ResourceProvider * m_provider;
ItemList m_items;
ResourcesTreeItem m_topLevelNode;
ResourceTreeItem m_topLevelNode;
signals:

View File

@@ -1,8 +1,8 @@
/*
* resources_item.h - header file for ResourcesItem
* ResourceItem.h - header file for ResourceItem
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,18 +22,18 @@
*
*/
#ifndef _RESOURCES_ITEM_H
#define _RESOURCES_ITEM_H
#ifndef _RESOURCE_ITEM_H
#define _RESOURCE_ITEM_H
#include <QtCore/QByteArray>
#include <QtCore/QDateTime>
#include "resources_provider.h"
#include "ResourceProvider.h"
class ResourcesTreeItem;
class ResourceTreeItem;
class ResourcesItem
class ResourceItem
{
public:
enum BaseDirectories
@@ -63,7 +63,7 @@ public:
} ;
typedef Types Type;
ResourcesItem( ResourcesProvider * _provider,
ResourceItem( ResourceProvider * _provider,
const QString & _name,
Type _type,
BaseDirectory _base_dir = BaseWorkingDir,
@@ -74,7 +74,7 @@ public:
const QDateTime & _last_mod = QDateTime() );
const ResourcesProvider * provider( void ) const
const ResourceProvider * provider( void ) const
{
return m_provider;
}
@@ -149,17 +149,17 @@ public:
return m_type != TypeUnknown && !m_name.isEmpty();
}
void setTreeItem( ResourcesTreeItem * _ti )
void setTreeItem( ResourceTreeItem * _ti )
{
m_treeItem = _ti;
}
ResourcesTreeItem * treeItem( void )
ResourceTreeItem * treeItem( void )
{
return m_treeItem;
}
const ResourcesTreeItem * treeItem( void ) const
const ResourceTreeItem * treeItem( void ) const
{
return m_treeItem;
}
@@ -186,21 +186,21 @@ public:
void reload( void );
bool operator==( const ResourcesItem & _other ) const;
bool operator==( const ResourceItem & _other ) const;
// rates equality with given item
int equalityLevel( const ResourcesItem & _other ) const;
int equalityLevel( const ResourceItem & _other ) const;
Type guessType( void ) const;
static QString getBaseDirectory( BaseDirectory _bd,
const ResourcesItem * _item = NULL );
const ResourceItem * _item = NULL );
private:
void init( void );
ResourcesProvider * m_provider;
ResourceProvider * m_provider;
QString m_name;
int m_nameHash;
Type m_type;
@@ -211,7 +211,7 @@ private:
QDateTime m_lastMod;
QString m_tags;
ResourcesTreeItem * m_treeItem;
ResourceTreeItem * m_treeItem;
} ;

View File

@@ -1,8 +1,8 @@
/*
* resources_provider.h - header file for ResourcesProvider
* ResourceProvider.h - header file for ResourceProvider
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,28 +22,28 @@
*
*/
#ifndef _RESOURCES_PROVIDER_H
#define _RESOURCES_PROVIDER_H
#ifndef _RESOURCE_PROVIDER_H
#define _RESOURCE_PROVIDER_H
#include <QtCore/QByteArray>
#include <QtCore/QObject>
#include <QtCore/QString>
class ResourcesDB;
class ResourcesItem;
class ResourceDB;
class ResourceItem;
class ResourcesProvider : public QObject
class ResourceProvider : public QObject
{
Q_OBJECT
public:
ResourcesProvider( const QString & _url );
virtual ~ResourcesProvider();
ResourceProvider( const QString & _url );
virtual ~ResourceProvider();
virtual QString providerName( void ) const = 0;
virtual void updateDatabase( void ) = 0;
virtual int dataSize( const ResourcesItem * _item ) const = 0;
virtual QByteArray fetchData( const ResourcesItem * _item,
virtual int dataSize( const ResourceItem * _item ) const = 0;
virtual QByteArray fetchData( const ResourceItem * _item,
int _maxSize = -1 ) const = 0;
// return wether this provider provides local resources
virtual bool isLocal( void ) const = 0;
@@ -60,14 +60,14 @@ public:
QString localCacheFile( void ) const;
ResourcesDB * database( void )
ResourceDB * database( void )
{
return m_database;
}
private:
ResourcesDB * m_database;
ResourceDB * m_database;
QString m_url;

View File

@@ -1,8 +1,8 @@
/*
* resources_tree_item.h - header file for ResourcesTreeItem
* ResourceTreeItem.h - header file for ResourceTreeItem
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,33 +22,33 @@
*
*/
#ifndef _RESOURCES_TREE_ITEM_H
#define _RESOURCES_TREE_ITEM_H
#ifndef _RESOURCE_TREE_ITEM_H
#define _RESOURCE_TREE_ITEM_H
#include <QtCore/QList>
#include "resources_item.h"
#include "ResourceItem.h"
#define foreachResourcesTreeItem(list) \
for(ResourcesTreeItemList::Iterator it=list.begin(); \
#define foreachResourceTreeItem(list) \
for(ResourceTreeItemList::Iterator it=list.begin(); \
it!=list.end();++it)
#define foreachConstResourcesTreeItem(list) \
for(ResourcesTreeItemList::ConstIterator it=list.begin();\
#define foreachConstResourceTreeItem(list) \
for(ResourceTreeItemList::ConstIterator it=list.begin();\
it!=list.end();++it)
class ResourcesTreeItem;
typedef QList<ResourcesTreeItem *> ResourcesTreeItemList;
class ResourceTreeItem;
typedef QList<ResourceTreeItem *> ResourceTreeItemList;
class ResourcesTreeItem
class ResourceTreeItem
{
public:
ResourcesTreeItem( ResourcesTreeItem * _parent = NULL,
ResourcesItem * _item = NULL );
ResourceTreeItem( ResourceTreeItem * _parent = NULL,
ResourceItem * _item = NULL );
~ResourcesTreeItem();
~ResourceTreeItem();
inline void setHidden( bool _h )
{
@@ -62,49 +62,49 @@ public:
int rowCount( void ) const;
ResourcesTreeItem * getChild( int _row );
ResourceTreeItem * getChild( int _row );
int row( void ) const;
inline void addChild( ResourcesTreeItem * _it )
inline void addChild( ResourceTreeItem * _it )
{
m_children.push_back( _it );
}
inline void removeChild( ResourcesTreeItem * _it )
inline void removeChild( ResourceTreeItem * _it )
{
m_children.removeAll( _it );
}
inline ResourcesTreeItemList & children( void )
inline ResourceTreeItemList & children( void )
{
return m_children;
}
inline const ResourcesTreeItemList & children( void ) const
inline const ResourceTreeItemList & children( void ) const
{
return m_children;
}
ResourcesTreeItem * findChild( const QString & _name,
ResourcesItem::BaseDirectory _base_dir );
ResourceTreeItem * findChild( const QString & _name,
ResourceItem::BaseDirectory _base_dir );
inline ResourcesItem * item( void )
inline ResourceItem * item( void )
{
return m_item;
}
inline const ResourcesItem * item( void ) const
inline const ResourceItem * item( void ) const
{
return m_item;
}
inline ResourcesTreeItem * parent( void )
inline ResourceTreeItem * parent( void )
{
return m_parent;
}
inline void setParent( ResourcesTreeItem * _parent )
inline void setParent( ResourceTreeItem * _parent )
{
m_parent = _parent;
}
@@ -122,15 +122,15 @@ public:
private:
// hide copy-ctor
ResourcesTreeItem( const ResourcesTreeItem & ) { }
ResourceTreeItem( const ResourceTreeItem & ) { }
ResourcesTreeItem * m_parent;
ResourcesTreeItemList m_children;
ResourceTreeItem * m_parent;
ResourceTreeItemList m_children;
bool m_hidden;
bool m_temporaryMarker;
ResourcesItem * m_item;
ResourceItem * m_item;
} ;

View File

@@ -1,8 +1,8 @@
/*
* resources_tree_model.h - tree-model for ResourcesDB
* ResourceTreeModel.h - tree-model for ResourceDB
*
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,20 +22,20 @@
*
*/
#ifndef _RESOURCES_TREE_MODEL_H
#define _RESOURCES_TREE_MODEL_H
#ifndef _RESOURCE_TREE_MODEL_H
#define _RESOURCE_TREE_MODEL_H
#include <QtCore/QAbstractItemModel>
#include "resources_db.h"
#include "ResourceDB.h"
class ResourcesTreeModel : public QAbstractItemModel
class ResourceTreeModel : public QAbstractItemModel
{
Q_OBJECT
public:
ResourcesTreeModel( ResourcesDB * _db, QObject * _parent = NULL );
virtual ~ResourcesTreeModel()
ResourceTreeModel( ResourceDB * _db, QObject * _parent = NULL );
virtual ~ResourceTreeModel()
{
}
@@ -62,15 +62,15 @@ public:
void setFilter( const QString & _s );
// return ResourcesTreeItem belonging to a certain index
static inline ResourcesTreeItem * treeItem( const QModelIndex & _idx )
// return ResourceTreeItem belonging to a certain index
static inline ResourceTreeItem * treeItem( const QModelIndex & _idx )
{
return static_cast<ResourcesTreeItem *>(
return static_cast<ResourceTreeItem *>(
_idx.internalPointer() );
}
// return ResourcesItem belonging to a certain index
static inline ResourcesItem * item( const QModelIndex & _idx )
// return ResourceItem belonging to a certain index
static inline ResourceItem * item( const QModelIndex & _idx )
{
return treeItem( _idx )->item();
}
@@ -80,15 +80,15 @@ public:
private:
bool filterItems( ResourcesTreeItem * _item,
bool filterItems( ResourceTreeItem * _item,
const QModelIndex & _parent,
const QStringList & _keywords );
void setHidden( ResourcesTreeItem * _item,
void setHidden( ResourceTreeItem * _item,
const QModelIndex & _parent,
bool _hidden,
bool _recursive = true );
ResourcesDB * m_db;
ResourceDB * m_db;
signals:

View File

@@ -1,8 +1,8 @@
/*
* resources_tree_view.h - view for ResourcesTreeModel
* resource_tree_view.h - view for ResourceTreeModel
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,19 +22,19 @@
*
*/
#ifndef _RESOURCES_TREE_VIEW_H
#define _RESOURCES_TREE_VIEW_H
#ifndef _RESOURCE_TREE_VIEW_H
#define _RESOURCE_TREE_VIEW_H
#include <QtGui/QTreeView>
class ResourcesTreeModel;
class ResourceTreeModel;
class ResourcesTreeView : public QTreeView
class ResourceTreeView : public QTreeView
{
Q_OBJECT
public:
ResourcesTreeView( ResourcesTreeModel * _tm, QWidget * _parent );
ResourceTreeView( ResourceTreeModel * _tm, QWidget * _parent );
public slots:
@@ -42,7 +42,7 @@ public slots:
void updateFilter( void );
private:
ResourcesTreeModel * m_tm;
ResourceTreeModel * m_tm;
QString m_lastFilter;

View File

@@ -1,8 +1,8 @@
/*
* unified_resources_provider.h - header file for UnifiedResourcesProvider
* UnifiedResourceProvider.h - header file for UnifiedResourceProvider
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,30 +22,30 @@
*
*/
#ifndef _UNIFIED_RESOURCES_PROVIDER_H
#define _UNIFIED_RESOURCES_PROVIDER_H
#ifndef _UNIFIED_RESOURCE_PROVIDER_H
#define _UNIFIED_RESOURCE_PROVIDER_H
#include "resources_provider.h"
#include "resources_item.h"
#include "ResourceProvider.h"
#include "ResourceItem.h"
class UnifiedResourcesProvider : public ResourcesProvider
class UnifiedResourceProvider : public ResourceProvider
{
Q_OBJECT
public:
UnifiedResourcesProvider();
virtual ~UnifiedResourcesProvider();
UnifiedResourceProvider();
virtual ~UnifiedResourceProvider();
void addDatabase( ResourcesDB * _db );
void addDatabase( ResourceDB * _db );
virtual QString providerName( void ) const
{
return "UnifiedResourcesProvider";
return "UnifiedResourceProvider";
}
virtual void updateDatabase( void );
virtual int dataSize( const ResourcesItem * _item ) const
virtual int dataSize( const ResourceItem * _item ) const
{
if( _item->provider() != this )
{
@@ -54,7 +54,7 @@ public:
return 0;
}
virtual QByteArray fetchData( const ResourcesItem * _item,
virtual QByteArray fetchData( const ResourceItem * _item,
int _maxSize = -1 ) const
{
if( _item->provider() != this )
@@ -80,7 +80,7 @@ private slots:
private:
QList<ResourcesDB *> m_mergedDatabases;
QList<ResourceDB *> m_mergedDatabases;
} ;

View File

@@ -1,8 +1,8 @@
/*
* web_resources_provider.h - header file for WebResourcesProvider
* WebResourceProvider.h - header file for WebResourceProvider
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,40 +22,40 @@
*
*/
#ifndef _WEB_RESOURCES_PROVIDER_H
#define _WEB_RESOURCES_PROVIDER_H
#ifndef _WEB_RESOURCE_PROVIDER_H
#define _WEB_RESOURCE_PROVIDER_H
#include <QtCore/QBuffer>
#include <QtXml/QDomNode>
#include "resources_provider.h"
#include "resources_item.h"
#include "ResourceProvider.h"
#include "ResourceItem.h"
class QHttp;
class WebResourcesProvider : public ResourcesProvider
class WebResourceProvider : public ResourceProvider
{
Q_OBJECT
public:
WebResourcesProvider( const QString & _url );
virtual ~WebResourcesProvider();
WebResourceProvider( const QString & _url );
virtual ~WebResourceProvider();
virtual QString providerName( void ) const
{
return "WebResourcesProvider";
return "WebResourceProvider";
}
virtual void updateDatabase( void );
virtual int dataSize( const ResourcesItem * _item ) const
virtual int dataSize( const ResourceItem * _item ) const
{
// asume that the size we have set before from the web
// catalogue is correct
return _item->size();
}
virtual QByteArray fetchData( const ResourcesItem * _item,
virtual QByteArray fetchData( const ResourceItem * _item,
int _maxSize = -1 ) const;
virtual bool isLocal( void ) const
@@ -69,10 +69,10 @@ private slots:
private:
ResourcesTreeItem * addTreeItem( ResourcesTreeItem * _parent,
ResourcesItem * _item );
ResourceTreeItem * addTreeItem( ResourceTreeItem * _parent,
ResourceItem * _item );
void importNodeIntoDB( const QDomNode & n,
ResourcesTreeItem * _parent );
ResourceTreeItem * _parent );
void download( const QString & _path, QBuffer * _target,
bool _wait = false ) const;

View File

@@ -45,7 +45,7 @@ class mainWindow;
class mixer;
class pianoRoll;
class projectNotes;
class UnifiedResourcesProvider;
class UnifiedResourceProvider;
class song;
class songEditor;
class ladspa2LMMS;
@@ -101,9 +101,9 @@ public:
return s_projectJournal;
}
static UnifiedResourcesProvider * getResourcesProvider( void )
static UnifiedResourceProvider * resourceProvider( void )
{
return s_resourcesProvider;
return s_resourceProvider;
}
// GUI
@@ -201,7 +201,7 @@ private:
static mixer * s_mixer;
static fxMixer * s_fxMixer;
static song * s_song;
static UnifiedResourcesProvider * s_resourcesProvider;
static UnifiedResourceProvider * s_resourceProvider;
static bbTrackContainer * s_bbTrackContainer;
static projectJournal * s_projectJournal;
static dummyTrackContainer * s_dummyTC;

View File

@@ -45,7 +45,7 @@ public:
ClipboardData,
JournalData,
EffectSettings,
ResourcesDatabase,
ResourceDatabase,
VideoProject, // might come later...
BurnProject, // might come later...
Playlist, // might come later...