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.

Sign up for GitHub

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

Jump to bottom

xbmcvfs python module #36

Closed
wants to merge 1 commit into from
Closed

xbmcvfs python module #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions XBMC.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@
183FDF8B11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; }; 183FDF8B11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
184C472F1296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; }; 184C472F1296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; };
184C47301296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; }; 184C47301296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; };
189047D21301DEAB00C11012 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; };
18B4A0021152BFA5001AF8A6 /* Addon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF11152BFA5001AF8A6 /* Addon.cpp */; }; 18B4A0021152BFA5001AF8A6 /* Addon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF11152BFA5001AF8A6 /* Addon.cpp */; };
18B4A0031152BFA5001AF8A6 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; }; 18B4A0031152BFA5001AF8A6 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
18B4A0041152BFA5001AF8A6 /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF91152BFA5001AF8A6 /* fft.cpp */; }; 18B4A0041152BFA5001AF8A6 /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF91152BFA5001AF8A6 /* fft.cpp */; };
Expand Down Expand Up @@ -1909,6 +1910,7 @@
183FDF8911AF0B0500B81E9C /* PluginSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginSource.h; sourceTree = "<group>"; }; 183FDF8911AF0B0500B81E9C /* PluginSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginSource.h; sourceTree = "<group>"; };
184C472D1296BC6E0006DB3E /* Service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Service.cpp; sourceTree = "<group>"; }; 184C472D1296BC6E0006DB3E /* Service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Service.cpp; sourceTree = "<group>"; };
184C472E1296BC6E0006DB3E /* Service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Service.h; sourceTree = "<group>"; }; 184C472E1296BC6E0006DB3E /* Service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Service.h; sourceTree = "<group>"; };
189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcvfsmodule.cpp; sourceTree = "<group>"; };
18B49FF11152BFA5001AF8A6 /* Addon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Addon.cpp; sourceTree = "<group>"; }; 18B49FF11152BFA5001AF8A6 /* Addon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Addon.cpp; sourceTree = "<group>"; };
18B49FF21152BFA5001AF8A6 /* Addon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Addon.h; sourceTree = "<group>"; }; 18B49FF21152BFA5001AF8A6 /* Addon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Addon.h; sourceTree = "<group>"; };
18B49FF31152BFA5001AF8A6 /* AddonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonDll.h; sourceTree = "<group>"; }; 18B49FF31152BFA5001AF8A6 /* AddonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonDll.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5993,6 +5995,7 @@
E38E19DA0D25F9FB00618676 /* xbmcmodule */ = { E38E19DA0D25F9FB00618676 /* xbmcmodule */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */,
7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */, 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */,
7CD2CCFF11B38B000009EFC1 /* PythonAddon.h */, 7CD2CCFF11B38B000009EFC1 /* PythonAddon.h */,
7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */, 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */,
Expand Down Expand Up @@ -8173,6 +8176,7 @@
433219D812E4C6A500CD7486 /* udf25.cpp in Sources */, 433219D812E4C6A500CD7486 /* udf25.cpp in Sources */,
433219D912E4C6A500CD7486 /* UDFDirectory.cpp in Sources */, 433219D912E4C6A500CD7486 /* UDFDirectory.cpp in Sources */,
7C4705AE12EF584C00369E51 /* AddonInstaller.cpp in Sources */, 7C4705AE12EF584C00369E51 /* AddonInstaller.cpp in Sources */,
189047D21301DEAB00C11012 /* xbmcvfsmodule.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
Expand Down
1 change: 1 addition & 0 deletions project/VS2010Express/XBMC.vcxproj
View file
Open in desktop
Expand Up @@ -492,6 +492,7 @@
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcguimodule.cpp" /> <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcguimodule.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcmodule.cpp" /> <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcmodule.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcplugin.cpp" /> <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcplugin.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcvfsmodule.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\XBPython.cpp" /> <ClCompile Include="..\..\xbmc\interfaces\python\XBPython.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\XBPyThread.cpp" /> <ClCompile Include="..\..\xbmc\interfaces\python\XBPyThread.cpp" />
<ClCompile Include="..\..\xbmc\LangInfo.cpp" /> <ClCompile Include="..\..\xbmc\LangInfo.cpp" />
Expand Down
3 changes: 3 additions & 0 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Open in desktop
Expand Up @@ -2456,6 +2456,9 @@
<ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp"> <ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp">
<Filter>addons</Filter> <Filter>addons</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcvfsmodule.cpp">
<Filter>interfaces\python\xbmcmodule</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h"> <ClInclude Include="..\..\xbmc\win32\pch.h">
Expand Down
8 changes: 7 additions & 1 deletion xbmc/interfaces/python/XBPython.cpp
View file
Open in desktop
Expand Up @@ -120,6 +120,9 @@ extern "C" {
void InitAddonModule(void); void InitAddonModule(void);
void InitAddonTypes(void); void InitAddonTypes(void);
void DeinitAddonModule(void); void DeinitAddonModule(void);
void InitVFSModule(void);
void InitVFSTypes(void);
void DeinitVFSModule(void);
} }


XBPython::XBPython() XBPython::XBPython()
Expand Down Expand Up @@ -298,7 +301,8 @@ void XBPython::InitializeInterpreter()
InitPluginModule(); // init xbmcplugin modules InitPluginModule(); // init xbmcplugin modules
InitGUIModule(); // init xbmcgui modules InitGUIModule(); // init xbmcgui modules
InitAddonModule(); // init xbmcaddon modules InitAddonModule(); // init xbmcaddon modules

InitVFSModule(); // init xbmcvfs modules

// redirecting default output to debug console // redirecting default output to debug console
if (PyRun_SimpleString("" if (PyRun_SimpleString(""
"import xbmc\n" "import xbmc\n"
Expand Down Expand Up @@ -326,6 +330,7 @@ void XBPython::DeInitializeInterpreter()
DeinitPluginModule(); DeinitPluginModule();
DeinitGUIModule(); DeinitGUIModule();
DeinitAddonModule(); DeinitAddonModule();
DeinitVFSModule();
} }


/** /**
Expand Down Expand Up @@ -408,6 +413,7 @@ void XBPython::Initialize()
InitGUITypes(); InitGUITypes();
InitPluginTypes(); InitPluginTypes();
InitAddonTypes(); InitAddonTypes();
InitVFSTypes();


if (!(m_mainThreadState = PyThreadState_Get())) if (!(m_mainThreadState = PyThreadState_Get()))
CLog::Log(LOGERROR, "Python threadstate is NULL."); CLog::Log(LOGERROR, "Python threadstate is NULL.");
Expand Down
1 change: 1 addition & 0 deletions xbmc/interfaces/python/xbmcmodule/Makefile
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@ SRCS=action.cpp \
xbmcguimodule.cpp \ xbmcguimodule.cpp \
xbmcmodule.cpp \ xbmcmodule.cpp \
xbmcplugin.cpp \ xbmcplugin.cpp \
xbmcvfsmodule.cpp \


LIB=xbmcmodule.a LIB=xbmcmodule.a


Expand Down