summaryrefslogtreecommitdiff
path: root/src/display.cpp
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2008-08-20 15:40:15 +0200
committerDennis kasprzyk <onestone@opencompositing.org>2008-08-20 15:40:15 +0200
commit682b0c5129f0fd88d259ca6f30e8ed469dc9a162 (patch)
tree21a1850a82b4191387dd4908299f09a2730b74ee /src/display.cpp
parentf4d3ba5048fd23ea455f8d50a81fca586bbc6197 (diff)
downloadzcomp-682b0c5129f0fd88d259ca6f30e8ed469dc9a162.tar.gz
zcomp-682b0c5129f0fd88d259ca6f30e8ed469dc9a162.tar.bz2
C++ port of CompMetadata.
Diffstat (limited to 'src/display.cpp')
-rw-r--r--src/display.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/display.cpp b/src/display.cpp
index fffa756..e9df259 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -530,7 +530,7 @@ CompWindow::shade (CompDisplay *d,
return true;
}
-const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
+const CompMetadata::OptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
{ "abi", "int", 0, 0, 0 },
{ "active_plugins", "list", "<type>string</type>", 0, 0 },
{ "texture_filter", "int", RESTOSTRING (0, 2), 0, 0 },
@@ -783,10 +783,8 @@ CompDisplay::init (const char *name)
// priv->connection = XGetXCBConnection (priv->dpy);
- if (!compInitDisplayOptionsFromMetadata (this,
- &coreMetadata,
- coreDisplayOptionInfo,
- priv->opt))
+ if (!coreMetadata->initDisplayOptions (this, coreDisplayOptionInfo,
+ COMP_DISPLAY_OPTION_NUM, priv->opt))
return true;
priv->opt[COMP_DISPLAY_OPTION_ABI].value ().set ((int) CORE_ABIVERSION);