Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/moving classes and files #765

Merged
merged 5 commits into from
Oct 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,459 changes: 2,320 additions & 6,139 deletions nbproject/configurations.xml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/GrandOrgueDef.h)

set(src
contrib/sha1.cpp
threading/GOCondition.cpp
threading/GOMutex.cpp
threading/GOWaitQueue.cpp
threading/GOrgueThread.cpp
GOSoundTouchWorkItem.cpp
GOrgueArchive.cpp
GOrgueArchiveCreator.cpp
Expand Down Expand Up @@ -68,7 +72,6 @@ GOrgueTemperament.cpp
GOrgueTemperamentCent.cpp
GOrgueTemperamentList.cpp
GOrgueTemperamentUser.cpp
GOrgueThread.cpp
GOrgueTimer.cpp
GOrgueUtil.cpp
GOrgueView.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/core/GOSoundTouchWorkItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "GOSoundTouchWorkItem.h"

#include "GOrgueMemoryPool.h"
#include "mutex_locker.h"
#include "threading/GOMutexLocker.h"

GOSoundTouchWorkItem::GOSoundTouchWorkItem(GOrgueMemoryPool& pool) :
m_Pool(pool),
Expand Down
2 changes: 1 addition & 1 deletion src/core/GOSoundTouchWorkItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define GOSOUNDTOUCHWORKITEM_H

#include "GOSoundWorkItem.h"
#include "mutex.h"
#include "threading/GOMutex.h"

class GOrgueMemoryPool;

Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueArchive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "GOrgueArchiveIndex.h"
#include "GOrgueArchiveReader.h"
#include "GOrgueInvalidFile.h"
#include "mutex_locker.h"
#include "threading/GOMutexLocker.h"
#include <wx/intl.h>
#include <wx/log.h>

Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueArchive.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef GORGUEARCHIVE_H
#define GORGUEARCHIVE_H

#include "mutex.h"
#include "threading/GOMutex.h"
#include <wx/file.h>
#include <wx/string.h>
#include <vector>
Expand Down
1 change: 1 addition & 0 deletions src/core/GOrgueArchiveCreator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <wx/dir.h>
#include <wx/filename.h>
#include <wx/intl.h>
#include <wx/log.h>

GOrgueArchiveCreator::GOrgueArchiveCreator(const GOrgueSettingDirectory& cacheDir) :
m_OrganList(),
Expand Down
4 changes: 2 additions & 2 deletions src/core/GOrgueLoadThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#ifndef GORGUELOADTHREAD_H
#define GORGUELOADTHREAD_H

#include "GOrgueThread.h"
#include "atomic.h"
#include "threading/atomic.h"
#include "threading/GOrgueThread.h"
#include <wx/string.h>
#include <wx/thread.h>

Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueMemoryPool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "GOrgueMemoryPool.h"

#include "mutex_locker.h"
#include "threading/GOMutexLocker.h"
#include <wx/file.h>
#include <wx/intl.h>
#include <wx/log.h>
Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueMemoryPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef GORGUEMEMORYPOOL_H_
#define GORGUEMEMORYPOOL_H_

#include "mutex.h"
#include "threading/GOMutex.h"
#include <set>

class wxFile;
Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueTimer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "GOrgueTimer.h"

#include "GOrgueTimerCallback.h"
#include "mutex_locker.h"
#include "threading/GOMutexLocker.h"

GOrgueTimer::GOrgueTimer() :
wxTimer(),
Expand Down
2 changes: 1 addition & 1 deletion src/core/GOrgueTimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define GORGUETIMER_H

#include "GOrgueTime.h"
#include "mutex.h"
#include "threading/GOMutex.h"
#include <wx/timer.h>
#include <vector>

Expand Down
241 changes: 0 additions & 241 deletions src/core/mutex.h

This file was deleted.

Loading