--- a/src/projectM-qt/qprojectm_mainwindow.hpp
+++ b/src/projectM-qt/qprojectm_mainwindow.hpp
@@ -1,5 +1,5 @@
/**
- * projectM-qt -- Qt4 based projectM GUI
+ * projectM-qt -- Qt4 based projectM GUI
* Copyright (C)2003-2004 projectM Team
*
* This library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
#include <QtDebug>
#include <QMutex>
-#include "projectM.hpp"
+#include "../libprojectM/projectM.hpp"
#include <QModelIndexList>
class QHeaderView;
@@ -63,7 +63,7 @@
signals:
void shuttingDown();
public:
-
+
projectM * GetProjectM();
typedef struct PlaylistItemMetaData {
@@ -72,15 +72,15 @@
url(_url), name(_name), rating(_rating), breedability(_breed), id(_id) {}
QString url;
- QString name;
+ QString name;
int rating;
int breedability;
long id;
inline bool operator==(const PlaylistItemMetaData & data) {
return data.id == id;
}
-
-
+
+
inline bool operator==(long rhs_id) {
return rhs_id == id;
}
@@ -89,7 +89,7 @@
void addPCM(float * buffer, unsigned int bufferSize);
-
+
typedef QVector<long> PlaylistItemVector;
QProjectM_MainWindow(const std::string & config_file, QMutex * audioMutex);
@@ -146,27 +146,27 @@
void removePlaylistItems(const QModelIndexList & items);
void dragAndDropPlaylistItems(const QModelIndexList &, const QModelIndex &);
-
+
private:
void readPlaylistSettings();
bool warnIfPlaylistModified();
-
+
void insertPlaylistItem(const PlaylistItemMetaData & data, int targetIndex);
void savePlaylist();
void updatePlaylistUrl(const QString & url);
unsigned long playlistItemCounter;
- QSize _oldPlaylistSize;
+ QSize _oldPlaylistSize;
void readConfig(const std::string & configFile);
void writeConfig();
void copyPlaylist();
-
+
QPresetEditorDialog * m_QPresetEditorDialog;
QHeaderView * hHeader;
QHeaderView * vHeader;
QString m_currentPlaylistUrl;
QModelIndexList selectedPlaylistIndexes;
-
+
QPlaylistModel * playlistModel;
Ui::QProjectM_MainWindow * ui;
QProjectMConfigDialog * configDialog;
@@ -179,7 +179,7 @@
bool _menuVisible;
bool _menuAndStatusBarsVisible;
QTimer * m_timer;
-
+
void createActions();
void createMenus();
void createToolBars();
@@ -199,7 +199,7 @@
QAction *aboutAct;
QAction *aboutQtAct;
- QString previousFilter;
+ QString previousFilter;
Qt::DockWidgetArea dockWidgetArea;
QPresetFileDialog * m_QPresetFileDialog;