[libchamplain] Add memphis specific stuff inside champlain bindings.
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Add memphis specific stuff inside champlain bindings.
- Date: Tue, 8 Jun 2010 00:18:33 +0000 (UTC)
commit 11fb3d9091fe7de48cada40f7a3945877805cc81
Author: Tomaž Vajngerl <quikee gmail com>
Date: Sat May 29 11:19:45 2010 +0200
Add memphis specific stuff inside champlain bindings.
bindings/vala/champlain/champlain-0.6.deps | 2 +
bindings/vala/champlain/champlain-0.6.vapi | 3 ++
.../vala/champlain/champlain-0.6/champlain-0.6.gi | 26 ++++++++++++++++++++
bindings/vala/champlain/create.sh | 2 +-
4 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/bindings/vala/champlain/champlain-0.6.deps b/bindings/vala/champlain/champlain-0.6.deps
index 39ce1f0..ad1aa40 100644
--- a/bindings/vala/champlain/champlain-0.6.deps
+++ b/bindings/vala/champlain/champlain-0.6.deps
@@ -1 +1,3 @@
clutter-1.0
+memphis-0.2
+
diff --git a/bindings/vala/champlain/champlain-0.6.vapi b/bindings/vala/champlain/champlain-0.6.vapi
index 25d5220..d702134 100644
--- a/bindings/vala/champlain/champlain-0.6.vapi
+++ b/bindings/vala/champlain/champlain-0.6.vapi
@@ -73,6 +73,7 @@ namespace Champlain {
}
[CCode (cheader_filename = "champlain/champlain.h")]
public class MapDataSource : GLib.InitiallyUnowned {
+ public virtual unowned Memphis.Map get_map_data ();
[NoAccessorMethod]
public Champlain.BoundingBox bounding_box { owned get; set; }
[NoAccessorMethod]
@@ -198,11 +199,13 @@ namespace Champlain {
public MemphisTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.MapDataSource map_data_source);
public Clutter.Color get_background_color ();
public unowned Champlain.MapDataSource get_map_data_source ();
+ public unowned Memphis.Rule get_rule (string id);
public unowned GLib.List get_rule_ids ();
public void load_rules (string rules_path);
public void remove_rule (string id);
public void set_background_color (Clutter.Color color);
public void set_map_data_source (Champlain.MapDataSource map_data_source);
+ public void set_rule (Memphis.Rule rule);
public Champlain.MapDataSource map_data_source { get; set construct; }
}
[CCode (cheader_filename = "champlain/champlain.h")]
diff --git a/bindings/vala/champlain/champlain-0.6/champlain-0.6.gi b/bindings/vala/champlain/champlain-0.6/champlain-0.6.gi
index 7e0b58a..2c066c2 100644
--- a/bindings/vala/champlain/champlain-0.6/champlain-0.6.gi
+++ b/bindings/vala/champlain/champlain-0.6/champlain-0.6.gi
@@ -305,8 +305,20 @@
</constructor>
</object>
<object name="ChamplainMapDataSource" parent="GInitiallyUnowned" type-name="ChamplainMapDataSource" get-type="champlain_map_data_source_get_type">
+ <method name="get_map_data" symbol="champlain_map_data_source_get_map_data">
+ <return-type type="MemphisMap*"/>
+ <parameters>
+ <parameter name="data_source" type="ChamplainMapDataSource*"/>
+ </parameters>
+ </method>
<property name="bounding-box" type="ChamplainBoundingBox*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="state" type="ChamplainState" readable="1" writable="1" construct="0" construct-only="0"/>
+ <vfunc name="get_map_data">
+ <return-type type="MemphisMap*"/>
+ <parameters>
+ <parameter name="data_source" type="ChamplainMapDataSource*"/>
+ </parameters>
+ </vfunc>
</object>
<object name="ChamplainMapSource" parent="GInitiallyUnowned" type-name="ChamplainMapSource" get-type="champlain_map_source_get_type">
<method name="fill_tile" symbol="champlain_map_source_fill_tile">
@@ -811,6 +823,13 @@
<parameter name="tile_source" type="ChamplainMemphisTileSource*"/>
</parameters>
</method>
+ <method name="get_rule" symbol="champlain_memphis_tile_source_get_rule">
+ <return-type type="MemphisRule*"/>
+ <parameters>
+ <parameter name="tile_source" type="ChamplainMemphisTileSource*"/>
+ <parameter name="id" type="gchar*"/>
+ </parameters>
+ </method>
<method name="get_rule_ids" symbol="champlain_memphis_tile_source_get_rule_ids">
<return-type type="GList*"/>
<parameters>
@@ -859,6 +878,13 @@
<parameter name="map_data_source" type="ChamplainMapDataSource*"/>
</parameters>
</method>
+ <method name="set_rule" symbol="champlain_memphis_tile_source_set_rule">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="tile_source" type="ChamplainMemphisTileSource*"/>
+ <parameter name="rule" type="MemphisRule*"/>
+ </parameters>
+ </method>
<property name="map-data-source" type="ChamplainMapDataSource*" readable="1" writable="1" construct="1" construct-only="0"/>
</object>
<object name="ChamplainNetworkMapDataSource" parent="ChamplainMapDataSource" type-name="ChamplainNetworkMapDataSource" get-type="champlain_network_map_data_source_get_type">
diff --git a/bindings/vala/champlain/create.sh b/bindings/vala/champlain/create.sh
index 402d908..f9a8c3c 100644
--- a/bindings/vala/champlain/create.sh
+++ b/bindings/vala/champlain/create.sh
@@ -1 +1 @@
-vapigen --library champlain-0.6 --pkg clutter-1.0 champlain-0.6/champlain-0.6.gi --metadata champlain-0.6/champlain-0.6.metadata
+vapigen --library champlain-0.6 --pkg clutter-1.0 --pkg memphis-0.2 champlain-0.6/champlain-0.6.gi --metadata champlain-0.6/champlain-0.6.metadata
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]