Permalink
Browse files

Revert "wip"

This reverts commit 0e8d33e10e4d1649827865b3aec4bb5231666f88.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28883 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
1 parent 6d3222e commit af8cb2a400e9caacea314b8db33d32c1b4dadd82 alcoheca committed Mar 26, 2010
Showing with 540 additions and 16,726 deletions.
  1. +1 −4 Makefile.in
  2. 0 addons/{cn.1ting.scraper → com.1ting.scraper}/1ting.xml
  3. BIN addons/{cn.1ting.scraper → com.1ting.scraper}/default.tbn
  4. 0 addons/{cn.1ting.scraper → com.1ting.scraper}/description.xml
  5. +0 −17 addons/org.xbmc.addons.dxspectrum/addon.xml
  6. +0 −15 addons/org.xbmc.addons.glspectrum/addon.xml
  7. BIN addons/org.xbmc.addons.glspectrum/opengl_spectrum.vis
  8. BIN addons/org.xbmc.addons.waveform/Waveform.vis
  9. +0 −256 addons/org.xbmc.core.vfs/core.c
  10. +0 −128 addons/org.xbmc.core.vfs/core.h
  11. +0 −15 addons/org.xbmc.core.vfs/plugin.xml
  12. +0 −27 addons/org.xbmc.core.vfs/vfsprovider.xsd
  13. +0 −1 configure.in
  14. +0 −1 language/English/strings.xml
  15. +2 −2 xbmc/FileSystem/FactoryDirectory.cpp
  16. +1 −0 xbmc/GUIWindowAddonBrowser.cpp
  17. +7 −19 xbmc/addons/Addon.cpp
  18. +506 −118 xbmc/addons/AddonManager.cpp
  19. +4 −22 xbmc/addons/AddonManager.h
  20. +0 −1 xbmc/addons/IAddon.h
  21. +0 −118 xbmc/lib/cpluff-0.1.3/config.h
  22. +0 −9 xbmc/lib/cpluff-0.1.3/examples/cpfile/cpfile
  23. +0 −1,504 xbmc/lib/cpluff-0.1.3/libcpluff/cpluff.h
  24. +0 −200 xbmc/lib/cpluff-0.1.3/libcpluff/cpluffdef.h
  25. +0 −1,256 xbmc/lib/cpluff-0.1.3/libcpluff/docsrc/Doxyfile-impl
  26. +0 −1,256 xbmc/lib/cpluff-0.1.3/libcpluff/docsrc/Doxyfile-ref
  27. +0 −1,241 xbmc/lib/cpluff-0.1.3/libcpluff/pcontrol.c
  28. +0 −1,190 xbmc/lib/cpluff-0.1.3/libcpluff/ploader.c
  29. +0 −8,906 xbmc/lib/cpluff-0.1.3/libtool
  30. +0 −403 xbmc/lib/cpluff-0.1.3/po/Makefile.in
  31. +0 −16 xbmc/lib/cpluff-0.1.3/po/POTFILES
  32. +0 −1 xbmc/lib/cpluff-0.1.3/stamp-h1
  33. +19 −0 xbmc/visualizations/Goom/net.sf.goom.vis/description.xml
View
@@ -90,7 +90,6 @@ endif
LIB_DIRS=\
xbmc/lib/cximage-6.0 \
- xbmc/lib/libcpluff \
xbmc/lib/libexif \
xbmc/lib/libhdhomerun \
xbmc/lib/libid3tag \
@@ -360,11 +359,9 @@ ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH))),)
endif
imagelib: dllloader
$(MAKE) -C xbmc/lib/cximage-6.0
-libcpluff: dllloader
- $(MAKE) -C xbmc/lib/libcpluff
codecs: papcodecs dvdpcodecs
-libs: libcpluff libhdhomerun libid3tag imagelib libexif python
+libs: libhdhomerun libid3tag imagelib libexif python
externals: codecs libs python visualizations screensavers
xcode_depends: \
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
- <id>vis.dxspectrum</id>
- <type>visualization</type>
- <title>DirectX Spectrum</title>
- <librarywin32>Spectrum_win32dx.vis</librarywin32>
- <version>1.0.0</version>
- <platforms>
- <platform>windows</platform>
- </platforms>
- <minversion>
- <xbmc>28000</xbmc>
- </minversion>
- <summary>DirectX Visualization</summary>
- <description>Visualisation showing a rotating 3D Spectrum Analyzer</description>
- <author>TEAMXBMC</author>
-</addoninfo>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon
- id="org.xbmc.addons.glspectrum"
- version="1.0.0"
- name="OpenGL Spectrum"
- summary="Visualisation showing a rotating 3D Spectrum Analyzer"
- provider-name="TEAMXBMC">
- <requires>
- <import addon="org.xbmc.core" version="28000"/>
- </requires>
- <extension
- point="org.xbmc.player.viz"
- name="OpenGL Spectrum"
- visualization="glspectrum"/>
-</addon>
Binary file not shown.
Binary file not shown.
@@ -1,256 +0,0 @@
-/*
-* Copyright (C) 2010 Team XBMC
-* http://www.xbmc.org
-*
-* This Program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This Program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with XBMC; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-* http://www.gnu.org/copyleft/gpl.html
-*
-*/
-
-#include "core.h"
-
-/* ------------------------------------------------------------------------
- * Data types
- * ----------------------------------------------------------------------*/
-
-
-/** Type for xbmc_vfs_ops structure */
-typedef struct xbmc_vfs_ops *vfsprovider_t;
-
-/** Plug-in instance data */
-struct plugin_data_t {
-
- /** The plug-in context */
- cp_context_t *ctx;
-
- /** Number of registered providers */
- int num_providers;
-
- /** An array of registered file system providers */
- registered_vfsprovider_t *providers;
-};
-
-typedef struct plugin_data_t plugin_data_t;
-
-/** Registered vfs addon info */
-struct registered_vfsprovider_t {
- const char *protocol;
- xbmc_vfs_ops *ops;
-};
-
-
-/* ------------------------------------------------------------------------
- * Internal functions
- * ----------------------------------------------------------------------*/
-
-/**
- * A run function for the core plug-in. In this case this function acts as
- * the application main function so there is no need for us to split the
- * execution into small steps. Rather, we execute the whole main loop at
- * once to make it simpler.
- */
-static int run(void *d) {
- plugin_data_t *data = d;
- char **argv;
- int argc;
- int i;
-
- // Go through all files listed as command arguments
- for (i = 1; argv[i] != NULL; i++) {
- int j;
- int classified = 0;
-
- // Print file name
- printf("%s: ", argv[i]);
-
- // Try providers in order of descending priority
- for (j = 0; !classified && j < data->num_providers; j++) {
- vfsprovider_t *cl
- = data->providers[j].provider;
-
- classified = cl->direxists(cl->data, argv[i]);
- }
-
- // Check if unknown file
- if (!classified) {
- fputs("unknown file type\n", stdout);
- }
- }
-
- // All done
- return 0;
-}
-
-/**
- * Creates a new plug-in instance.
- */
-static void *create(cp_context_t *ctx) {
- plugin_data_t *data = malloc(sizeof(plugin_data_t));
- if (data != NULL) {
- data->ctx = ctx;
- data->num_providers = 0;
- data->providers = NULL;
- } else {
- cp_log(ctx, CP_LOG_ERROR,
- "Insufficient memory for plug-in data.");
- }
- return data;
-}
-
-/**
- * Initializes and starts the plug-in.
- */
-static int start(void *d) {
- plugin_data_t *data = d;
- cp_extension_t **pr_exts;
- int num_pr_exts;
- cp_status_t status;
- int i;
-
- // Obtain list of registered file system providers
- pr_exts = cp_get_extensions_info(
- data->ctx,
- "org.xbmc.vfs.providers",
- &status,
- &num_pr_exts
- );
- if (pr_exts == NULL) {
-
- // An error occurred and framework logged it
- return status;
- }
-
- // Allocate memory for vfsprovider information, if any
- if (num_pr_exts > 0) {
- data->providers = malloc(
- num_pr_exts * sizeof(registered_vfsprovider_t)
- );
- if (data->providers == NULL) {
- // Memory allocation failed
- cp_log(data->ctx, CP_LOG_ERROR,
- "Insufficient memory for providers list.");
- return CP_ERR_RESOURCE;
- }
- }
-
- /* Resolve providers functions. This will implicitly start
- * plug-ins providing the file systems. */
- for (i = 0; i < num_pr_exts; i++) {
- const char *str;
- vfsprovider_t *pr;
-
- // Resolve provider data pointer
- str = cp_lookup_cfg_value(
- pr_exts[i]->configuration, "@provider");
- if (str == NULL) {
-
- // Provider symbol name is missing
- cp_log(data->ctx, CP_LOG_ERROR,
- "Ignoring vfsprovider without symbol name.");
- continue;
- }
- pr = cp_resolve_symbol(
- data->ctx,
- pr_exts[i]->plugin->identifier,
- str,
- NULL
- );
- if (pr == NULL) {
-
- // Could not resolve provider symbol
- cp_log(data->ctx, CP_LOG_ERROR,
- "Ignoring provider which could not be resolved.");
- continue;
- }
-
- // Get the protocol supported
- str = cp_lookup_cfg_value(
- pr_exts[i]->configuration, "@protocol"
- );
- if (str == NULL) {
-
- // provider is missing mandatory protocol
- cp_log(data->ctx, CP_LOG_ERROR,
- "Ignoring provider without protocol.");
- continue;
-
- // Add provider to the list of registered providers
- data->providers[data->num_providers].protocol = str;
- data->providers[data->num_providers].provider = pr;
- data->num_providers++;
- }
- }
-
- // Release extension information
- cp_release_info(data->ctx, pr_exts);
-
- // Register run function to do the real work
- cp_run_function(data->ctx, run);
-
- if (data->num_providers) {
- cp_log(data->ctx, CP_LOG_DEBUG,
- "VFS: NO providers %i");
- } else {
- cp_log(data->ctx, CP_LOG_DEBUG,
- "VFS: some providers %i");
- }
-
- // Successfully started
- return CP_OK;
-}
-
-/**
- * Releases resources from other plug-ins.
- */
-static void stop(void *d) {
- plugin_data_t *data = d;
- int i;
-
- if (data->providers != NULL) {
- for (i = 0; i < data->num_providers; i++) {
- cp_release_symbol(
- data->ctx, data->providers[i].provider
- );
- }
-
- // Free local data
- free(data->providers);
- data->providers = NULL;
- data->num_providers = 0;
- }
-}
-
-/**
- * Destroys a plug-in instance.
- */
-static void destroy(void *d) {
- free(d);
-}
-
-
-/* ------------------------------------------------------------------------
- * Exported runtime information
- * ----------------------------------------------------------------------*/
-
-/**
- * Plug-in runtime information for the framework. The name of this symbol
- * is stored in the plug-in descriptor.
- */
-CP_EXPORT cp_plugin_runtime_t xbmc_vfs_providers_core_funcs = {
- create,
- start,
- stop,
- destroy
-};
Oops, something went wrong.

0 comments on commit af8cb2a

Please sign in to comment.