libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-02-08 18:16:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed usage of boost::signals v1.

Browse Source 
Cleaned up spaces and added missing file in project.

git-svn-id: http://svn.purei.org/purei/trunk@968 b36208d7-6611-0410-8bec-b1987f11c4a2
This commit is contained in:
jpd002 2012-08-03 23:32:46 +00:00
parent b9359dd73b
commit f3743330e4
9 changed files with 85 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tools/PsfPlayer/Source/Playlist.h
View File

@ -2,14 +2,14 @@
#define _PLAYLIST_H_
#include "PsfTags.h"
#include <boost/signal.hpp>
#include <vector>
#include <boost/signals2.hpp>
class CPlaylist
{
public:
struct ITEM
{
struct ITEM
{
ITEM()
: length(0)
, id(0)
@ -18,52 +18,52 @@ public:
}
std::wstring path;
std::wstring title;
double length;
std::wstring path;
std::wstring title;
double length;
unsigned int id;
unsigned int archiveId;
};
};
typedef boost::signal<void (const ITEM&)> OnItemInsertEvent;
typedef boost::signal<void (unsigned int, const ITEM&)> OnItemUpdateEvent;
typedef boost::signal<void (unsigned int)> OnItemDeleteEvent;
typedef boost::signal<void ()> OnItemsClearEvent;
typedef boost::signals2::signal<void (const ITEM&)> OnItemInsertEvent;
typedef boost::signals2::signal<void (unsigned int, const ITEM&)> OnItemUpdateEvent;
typedef boost::signals2::signal<void (unsigned int)> OnItemDeleteEvent;
typedef boost::signals2::signal<void ()> OnItemsClearEvent;
CPlaylist();
virtual ~CPlaylist();
CPlaylist();
virtual ~CPlaylist();
const ITEM& GetItem(unsigned int) const;
const ITEM& GetItem(unsigned int) const;
int FindItem(unsigned int) const;
unsigned int GetItemCount() const;
unsigned int GetItemCount() const;
void Read(const boost::filesystem::path&);
void Write(const boost::filesystem::path&);
void Read(const boost::filesystem::path&);
void Write(const boost::filesystem::path&);
static bool IsLoadableExtension(const char*);
static void PopulateItemFromTags(ITEM&, const CPsfTags&);
static void PopulateItemFromTags(ITEM&, const CPsfTags&);
unsigned int InsertArchive(const wchar_t*);
std::wstring GetArchive(unsigned int) const;
unsigned int InsertItem(const ITEM&);
void UpdateItem(unsigned int, const ITEM&);
void DeleteItem(unsigned int);
void UpdateItem(unsigned int, const ITEM&);
void DeleteItem(unsigned int);
void ExchangeItems(unsigned int, unsigned int);
void Clear();
void Clear();
OnItemInsertEvent OnItemInsert;
OnItemUpdateEvent OnItemUpdate;
OnItemDeleteEvent OnItemDelete;
OnItemsClearEvent OnItemsClear;
OnItemInsertEvent OnItemInsert;
OnItemUpdateEvent OnItemUpdate;
OnItemDeleteEvent OnItemDelete;
OnItemsClearEvent OnItemsClear;
private:
typedef std::vector<ITEM> ItemList;
typedef std::vector<ITEM> ItemList;
typedef std::vector<std::wstring> ArchiveList;
typedef ItemList::const_iterator ItemIterator;
typedef ItemList::const_iterator ItemIterator;
static const char* g_loadableExtensions[];
ItemList m_items;
ItemList m_items;
ArchiveList m_archives;
unsigned int m_currentItemId;
};

8
tools/PsfPlayer/Source/PsfVm.h
View File

@ -9,12 +9,12 @@
#include "Debuggable.h"
#include "MailBox.h"
#include <boost/thread.hpp>
#include <boost/signal.hpp>
class CPsfVm : public CVirtualMachine, public boost::signals::trackable
class CPsfVm : public CVirtualMachine, public boost::signals2::trackable
{
public:
typedef std::tr1::function<CSoundHandler* ()> SpuHandlerFactory;
typedef std::function<CSoundHandler* ()> SpuHandlerFactory;
typedef boost::signals2::signal<void ()> OnNewFrameEvent;
CPsfVm();
virtual ~CPsfVm();
@ -43,7 +43,7 @@ public:
void SaveDebugTags(const char*);
#endif
boost::signal<void ()> OnNewFrame;
OnNewFrameEvent OnNewFrame;
private:
void ThreadProc();

4
tools/PsfPlayer/Source/PsfVmSubSystem.h
View File

@ -6,7 +6,7 @@
#include "BiosDebugInfoProvider.h"
#include "iop/Iop_SpuBase.h"
#include "SoundHandler.h"
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
class CPsfVmSubSystem
{
@ -27,7 +27,7 @@ public:
virtual void SaveDebugTags(Framework::Xml::CNode*) = 0;
#endif
boost::signal<void ()> OnNewFrame;
boost::signals2::signal<void ()> OnNewFrame;
};
typedef std::shared_ptr<CPsfVmSubSystem> PsfVmSubSystemPtr;

4
tools/PsfPlayer/Source/win32_ui/MainWindow.cpp
View File

@ -354,7 +354,7 @@ long CMainWindow::OnWndProc(unsigned int msg, WPARAM wParam, LPARAM lParam)
if(m_taskBarList && (msg == m_taskBarList->GetCreatedMessage()))
{
static const int buttonCount = 3;
static const UINT buttonIds[3] =
static const UINT buttonIds[buttonCount] =
{
ID_FILE_PREVIOUSTRACK,
ID_FILE_PAUSE,
@ -483,7 +483,7 @@ long CMainWindow::OnSize(unsigned int type, unsigned int width, unsigned int hei
void CMainWindow::OnPlaylistItemDblClick(unsigned int index)
{
const CPlaylist::ITEM& item(m_playlist.GetItem(index));
const auto& item(m_playlist.GetItem(index));
boost::filesystem::path archivePath;
if(item.archiveId != 0)

2
tools/PsfPlayer/Source/win32_ui/MainWindow.h
View File

@ -21,7 +21,7 @@
#include "AcceleratorTable.h"
#include "LockFreeQueue.h"
class CMainWindow : public Framework::Win32::CDialog, public boost::signals::trackable
class CMainWindow : public Framework::Win32::CDialog, public boost::signals2::trackable
{
public:
CMainWindow(CPsfVm&);

63
tools/PsfPlayer/Source/win32_ui/PlaylistPanel.h
View File

@ -6,55 +6,56 @@
#include "win32/Layouts.h"
#include "win32/ListView.h"
#include "win32/Button.h"
#include <boost/signals2.hpp>
class CPlaylistPanel : public Framework::Win32::CDialog, public boost::signals::trackable
class CPlaylistPanel : public Framework::Win32::CDialog, public boost::signals2::trackable
{
public:
typedef boost::signal<void (unsigned int)> OnItemDblClickEvent;
typedef boost::signal<void ()> OnAddClickEvent;
typedef boost::signal<void (unsigned int)> OnRemoveClickEvent;
typedef boost::signal<void ()> OnSaveClickEvent;
typedef boost::signals2::signal<void (unsigned int)> OnItemDblClickEvent;
typedef boost::signals2::signal<void ()> OnAddClickEvent;
typedef boost::signals2::signal<void (unsigned int)> OnRemoveClickEvent;
typedef boost::signals2::signal<void ()> OnSaveClickEvent;
CPlaylistPanel(HWND, CPlaylist&);
virtual ~CPlaylistPanel();
CPlaylistPanel(HWND, CPlaylist&);
virtual ~CPlaylistPanel();
void RefreshLayout();
void RefreshLayout();
OnItemDblClickEvent OnItemDblClick;
OnAddClickEvent OnAddClick;
OnRemoveClickEvent OnRemoveClick;
OnSaveClickEvent OnSaveClick;
OnItemDblClickEvent OnItemDblClick;
OnAddClickEvent OnAddClick;
OnRemoveClickEvent OnRemoveClick;
OnSaveClickEvent OnSaveClick;
protected:
long OnCommand(unsigned short, unsigned short, HWND);
long OnNotify(WPARAM, NMHDR*);
long OnCommand(unsigned short, unsigned short, HWND);
long OnNotify(WPARAM, NMHDR*);
long OnSize(unsigned int, unsigned int, unsigned int);
private:
void CreateColumns();
void OnPlaylistItemInsert(const CPlaylist::ITEM&);
void OnPlaylistItemUpdate(unsigned int, const CPlaylist::ITEM&);
void OnPlaylistItemDelete(unsigned int);
void OnPlaylistItemsClear();
void AddItem(const TCHAR*, const TCHAR*);
void ModifyItem(int, const TCHAR*, const TCHAR*);
void CreateColumns();
void OnPlaylistItemInsert(const CPlaylist::ITEM&);
void OnPlaylistItemUpdate(unsigned int, const CPlaylist::ITEM&);
void OnPlaylistItemDelete(unsigned int);
void OnPlaylistItemsClear();
void AddItem(const TCHAR*, const TCHAR*);
void ModifyItem(int, const TCHAR*, const TCHAR*);
void ExchangeItems(unsigned int, unsigned int);
void OnMoveUpButtonClick();
void OnMoveDownButtonClick();
void OnAddButtonClick();
void OnRemoveButtonClick();
void OnSaveButtonClick();
void OnPlaylistViewDblClick(NMITEMACTIVATE*);
void OnAddButtonClick();
void OnRemoveButtonClick();
void OnSaveButtonClick();
void OnPlaylistViewDblClick(NMITEMACTIVATE*);
Framework::LayoutObjectPtr m_layout;
Framework::LayoutObjectPtr m_layout;
CPlaylist& m_playlist;
Framework::Win32::CListView* m_playlistView;
CPlaylist& m_playlist;
Framework::Win32::CListView* m_playlistView;
Framework::Win32::CButton* m_moveUpButton;
Framework::Win32::CButton* m_moveDownButton;
Framework::Win32::CButton* m_addButton;
Framework::Win32::CButton* m_removeButton;
Framework::Win32::CButton* m_saveButton;
Framework::Win32::CButton* m_addButton;
Framework::Win32::CButton* m_removeButton;
Framework::Win32::CButton* m_saveButton;
};
#endif

2
tools/PsfPlayer/Source/win32_ui/StdAfx.h
View File

@ -11,7 +11,7 @@
#include <functional>
#include <memory>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/thread.hpp>
#include <boost/static_assert.hpp>

15
tools/PsfPlayer/build_win32/PsfPlayer.vcxproj
View File

@ -121,9 +121,10 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm111 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -139,7 +140,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
</ClCompile>
@ -157,7 +158,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
</ClCompile>
@ -175,7 +176,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;DEBUGGER_INCLUDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_NULL_SIFMAN;FUNCTIONSVIEW_STANDALONE;RAR_SUPPORT;DEBUGGER_INCLUDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
</ClCompile>
@ -195,7 +196,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_NULL_SIFMAN;_CRT_SECURE_NO_WARNINGS;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_NULL_SIFMAN;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
</ClCompile>
@ -217,7 +218,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_NULL_SIFMAN;_CRT_SECURE_NO_WARNINGS;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_NULL_SIFMAN;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;RAR_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FrameworkRoot)\include;$(ProjectDir)\..\Source;$(ProjectDir)\..\..\..\Source;D:\Projects\CodeGen\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>StdAfx.h</ForcedIncludeFiles>
</ClCompile>
@ -266,6 +267,7 @@
<ClCompile Include="..\..\..\Source\iop\Iop_Sysmem.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Thbase.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Thevent.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Thmsgbx.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Thsema.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Timrman.cpp" />
<ClCompile Include="..\..\..\Source\iop\Iop_Vblank.cpp" />
@ -412,6 +414,7 @@
<ClInclude Include="..\..\..\Source\iop\Iop_Sysmem.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Thbase.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Thevent.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Thmsgbx.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Thsema.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Timrman.h" />
<ClInclude Include="..\..\..\Source\iop\Iop_Vblank.h" />

6
tools/PsfPlayer/build_win32/PsfPlayer.vcxproj.filters
View File

@ -376,6 +376,9 @@
<ClCompile Include="..\Source\PsfZipArchive.cpp">
<Filter>Source Files\archives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\iop\Iop_Thmsgbx.cpp">
<Filter>Source Files\Purei Core\iop</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\BasicBlock.h">
@ -732,6 +735,9 @@
<ClInclude Include="..\Source\PsfZipArchive.h">
<Filter>Source Files\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\iop\Iop_Thmsgbx.h">
<Filter>Source Files\Purei Core\iop</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\Todolist.txt" />