Changeset 3897 for trunk/jalv/src/state.c

Timestamp:

2011-12-21 13:00:56 (17 months ago)

Author:

drobilla

Message:

Merge preset and state saving.

File:

• trunk/jalv/src/state.c (modified) (8 diffs)

trunk/jalv/src/state.c

@@ -183 +183 @@
 }
 
-void
-jalv_save(Jalv* jalv, const char* dir)
-{
-    char* const path   = strjoin(dir, "/state.ttl");
-    FILE*       out_fd = fopen(path, "w");
+int
+write_preset(Jalv* jalv, const char* path)
+{
+    FILE* fd = fopen(path, "w");
+    if (!fd) {
+        fprintf(stderr, "error: Failed to open %s (%s)\n",
+                path, strerror(errno));
+        return 1;
+    }
 
     SerdEnv* env = serd_env_new(NULL);
@@ -211 +215 @@
         &SERD_URI_NULL,
         file_sink,
-        out_fd);
+        fd);
 
     serd_env_foreach(env, (SerdPrefixSink)serd_writer_set_prefix, writer);
@@ -255 +259 @@
     // Close state file and clean up Serd
     serd_writer_free(writer);
-    fclose(out_fd);
+    fclose(fd);
     serd_env_free(env);
 
+    return 0;
+}
+
+void
+jalv_save(Jalv* jalv, const char* dir)
+{
+    char* const path = strjoin(dir, "/state.ttl");
+    write_preset(jalv, path);
     free(path);
 }
@@ -552 +564 @@
 
 static int
-add_preset_to_manifest(SerdEnv*          env,
-                       const LilvPlugin* plugin,
+add_preset_to_manifest(const LilvPlugin* plugin,
                        const char*       manifest_path,
                        const char*       preset_uri,
@@ -586 +597 @@
     }
 
-    // Open preset file
-    FILE* fd = fopen((char*)path, "w");
-    if (!fd) {
-        fprintf(stderr, "error: Failed to open %s (%s)\n",
-                path, strerror(errno));
-        ret = 3;
-        goto done;
-    }
-
-    SerdURI  base_uri;
-    SerdNode base = serd_node_new_uri_from_string((const uint8_t*)uri,
-                                                  NULL, &base_uri);
-
-    SerdEnv* env = serd_env_new(&base);
-    serd_env_set_prefix_from_strings(env, USTR("lv2"),  USTR(NS_LV2));
-    serd_env_set_prefix_from_strings(env, USTR("pset"), USTR(NS_PSET));
-    serd_env_set_prefix_from_strings(env, USTR("rdfs"), USTR(NS_RDFS));
-
     // Write preset file
-
-    SerdWriter* writer = serd_writer_new(
-        SERD_TURTLE, SERD_STYLE_ABBREVIATED|SERD_STYLE_CURIED,
-        env, &base_uri,
-        file_sink,
-        fd);
-
-    serd_env_foreach(env, (SerdPrefixSink)serd_writer_set_prefix, writer);
-
-    // <> a pset:Preset
-    SerdNode s = serd_node_from_string(SERD_URI, USTR(""));
-    SerdNode p = serd_node_from_string(SERD_URI, USTR(NS_RDF "type"));
-    SerdNode o = serd_node_from_string(SERD_CURIE, USTR("pset:Preset"));
-    serd_writer_write_statement(writer, 0, NULL, &s, &p, &o, NULL, NULL);
-
-    // <> rdfs:label label
-    p = serd_node_from_string(SERD_URI, USTR(NS_RDFS "label"));
-    o = serd_node_from_string(SERD_LITERAL, USTR(label));
-    serd_writer_write_statement(writer, 0,
-                                NULL, &s, &p, &o, NULL, NULL);
-
-    jalv_save_port_values(jalv, writer, &s);
-
-    serd_writer_free(writer);
-    serd_node_free(&base);
-
-    fclose(fd);
-    add_preset_to_manifest(env, jalv->plugin,
-                           manifest_path, filename, filename);
-
-    serd_env_free(env);
+    write_preset(jalv, path);
+
+    // Add entry to manifest
+    add_preset_to_manifest(jalv->plugin, manifest_path, filename, filename);
 
 done:
@@ -649 +615 @@
 
 static int
-add_preset_to_manifest(SerdEnv*          env,
-                       const LilvPlugin* plugin,
+add_preset_to_manifest(const LilvPlugin* plugin,
                        const char*       manifest_path,
                        const char*       preset_uri,
@@ -662 +627 @@
     }
 
+    SerdEnv* env = serd_env_new(NULL);
+    serd_env_set_prefix_from_strings(env, USTR("lv2"),   USTR(NS_LV2));
+    serd_env_set_prefix_from_strings(env, USTR("pset"),  USTR(NS_PSET));
+    serd_env_set_prefix_from_strings(env, USTR("rdfs"),  USTR(NS_RDFS));
+
 #ifdef HAVE_LOCKF
     lockf(fileno(fd), F_LOCK, 0);
@@ -709 +679 @@
     fclose(fd);
     free(manifest_uri);
+    serd_env_free(env);
 
     return 0;