summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2013-07-12 16:03:07 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2013-07-12 16:17:15 +0200
commitfacc91a942ee216eea6c1bdbba5f2072301004ad (patch)
tree8cd13581eb1e3a8f0476dc5729c4f58bbfb63d20 /examples
parenta6a82935958447716f1ba54a9bae648353ad1269 (diff)
permissions: simplify API a little
Avoid passing GstStructure in the add_role method, use varargs instead to construct the structure behind the scenes. We can then also use the structure name as the role and simplify some more logic.
Diffstat (limited to 'examples')
-rw-r--r--examples/test-auth.c20
-rw-r--r--examples/test-cgroups.c10
2 files changed, 12 insertions, 18 deletions
diff --git a/examples/test-auth.c b/examples/test-auth.c
index b4fc62a..b72161e 100644
--- a/examples/test-auth.c
+++ b/examples/test-auth.c
@@ -95,19 +95,16 @@ main (int argc, char *argv[])
/* allow user and admin to access this resource */
permissions = gst_rtsp_permissions_new ();
gst_rtsp_permissions_add_role (permissions, "user",
- gst_structure_new ("user",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL);
gst_rtsp_permissions_add_role (permissions, "admin",
- gst_structure_new ("admin",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL);
/* admin2 can look at the media but not construct so he gets a
* 401 Unauthorized */
gst_rtsp_permissions_add_role (permissions, "admin2",
- gst_structure_new ("admin2",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, FALSE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, FALSE, NULL);
gst_rtsp_media_factory_set_permissions (factory, permissions);
gst_rtsp_permissions_unref (permissions);
@@ -124,9 +121,8 @@ main (int argc, char *argv[])
/* user and admin have no permissions so they can't even see the
* media and get a 404 Not Found */
gst_rtsp_permissions_add_role (permissions, "admin2",
- gst_structure_new ("admin2",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL);
gst_rtsp_media_factory_set_permissions (factory, permissions);
gst_rtsp_permissions_unref (permissions);
diff --git a/examples/test-cgroups.c b/examples/test-cgroups.c
index db8e339..7669c3d 100644
--- a/examples/test-cgroups.c
+++ b/examples/test-cgroups.c
@@ -194,13 +194,11 @@ main (int argc, char *argv[])
/* allow user and admin to access this resource */
permissions = gst_rtsp_permissions_new ();
gst_rtsp_permissions_add_role (permissions, "user",
- gst_structure_new ("user",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL);
gst_rtsp_permissions_add_role (permissions, "admin",
- gst_structure_new ("admin",
- "media.factory.access", G_TYPE_BOOLEAN, TRUE,
- "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL));
+ "media.factory.access", G_TYPE_BOOLEAN, TRUE,
+ "media.factory.construct", G_TYPE_BOOLEAN, TRUE, NULL);
gst_rtsp_media_factory_set_permissions (factory, permissions);
gst_rtsp_permissions_unref (permissions);