Author: akv
Date: 2012-08-25 12:15:44 +0200 (Sat, 25 Aug 2012)
New Revision: 4267
Modified:
branches/4175-enfuse/src/filename.c
branches/4175-enfuse/src/filename.h
branches/4175-enfuse/src/gtk-interface.c
branches/4175-enfuse/src/rs-actions.c
branches/4175-enfuse/src/rs-batch.c
branches/4175-enfuse/src/rs-enfuse.c
branches/4175-enfuse/src/rs-tethered-shooting.c
Log:
Allowing to use filename_parse() without loading metadata.
Modified: branches/4175-enfuse/src/filename.c
===================================================================
--- branches/4175-enfuse/src/filename.c 2012-08-25 09:44:15 UTC (rev 4266)
+++ branches/4175-enfuse/src/filename.c 2012-08-25 10:15:44 UTC (rev 4267)
@@ -38,7 +38,7 @@
static void filename_add_clicked(GtkButton *button, gpointer user_data);
gchar *
-filename_parse(const gchar *in, const gchar *filename, const gint snapshot)
+filename_parse(const gchar *in, const gchar *filename, const gint snapshot,
gboolean load_metadata)
{
/*
* %f = filename
@@ -59,8 +59,11 @@
gint i = 1;
gchar *basename;
gchar *path;
- RSMetadata *metadata = rs_metadata_new_from_file(filename);
+ RSMetadata *metadata = NULL;
+ if (load_metadata)
+ rs_metadata_new_from_file(filename);
+
if (filename == NULL) return NULL;
if (in == NULL) return NULL;
@@ -70,7 +73,9 @@
/* Prepare time/date */
struct tm *tm = g_new0(struct tm, 1);
- time_t tt = (time_t) metadata->timestamp;
+ time_t tt;
+ if (metadata)
+ tt = (time_t) metadata->timestamp;
gmtime_r(&tt, tm);
if (output != NULL) {
Modified: branches/4175-enfuse/src/filename.h
===================================================================
--- branches/4175-enfuse/src/filename.h 2012-08-25 09:44:15 UTC (rev 4266)
+++ branches/4175-enfuse/src/filename.h 2012-08-25 10:15:44 UTC (rev 4267)
@@ -20,7 +20,7 @@
#ifndef FILENAME_H
#define FILENAME_H
-gchar *filename_parse(const gchar *in, const gchar *filename, const gint
snapshot);
+gchar *filename_parse(const gchar *in, const gchar *filename, const gint
snapshot, gboolean load_metadata);
extern GtkWidget *rs_filename_chooser_button_new(gchar **filename, const gchar
*conf_key);
#endif
Modified: branches/4175-enfuse/src/gtk-interface.c
===================================================================
--- branches/4175-enfuse/src/gtk-interface.c 2012-08-25 09:44:15 UTC (rev
4266)
+++ branches/4175-enfuse/src/gtk-interface.c 2012-08-25 10:15:44 UTC (rev
4267)
@@ -728,7 +728,7 @@
RSOutput *output;
GtkLabel *example = GTK_LABEL(quick->example_label);
- parsed = filename_parse(quick->filename, "filename", 0);
+ parsed = filename_parse(quick->filename, "filename", 0, TRUE);
output = rs_output_new(quick->output_type);
if (output)
Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c 2012-08-25 09:44:15 UTC (rev
4266)
+++ branches/4175-enfuse/src/rs-actions.c 2012-08-25 10:15:44 UTC (rev
4267)
@@ -243,7 +243,7 @@
g_string_append(filename, ".");
g_string_append(filename, rs_output_get_extension(output));
- parsed_filename = filename_parse(filename->str, rs->photo->filename,
rs->current_setting);
+ parsed_filename = filename_parse(filename->str, rs->photo->filename,
rs->current_setting, TRUE);
if (parsed_filename && output)
{
Modified: branches/4175-enfuse/src/rs-batch.c
===================================================================
--- branches/4175-enfuse/src/rs-batch.c 2012-08-25 09:44:15 UTC (rev 4266)
+++ branches/4175-enfuse/src/rs-batch.c 2012-08-25 10:15:44 UTC (rev 4267)
@@ -497,7 +497,7 @@
g_string_append(filename, ".");
g_string_append(filename,
rs_output_get_extension(queue->output));
- parsed_filename = filename_parse(filename->str,
filename_in, setting_id);
+ parsed_filename = filename_parse(filename->str,
filename_in, setting_id, TRUE);
/* Create directory, if it doesn't exist */
parsed_dir = g_path_get_dirname(parsed_filename);
Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c 2012-08-25 09:44:15 UTC (rev
4266)
+++ branches/4175-enfuse/src/rs-enfuse.c 2012-08-25 10:15:44 UTC (rev
4267)
@@ -313,7 +313,7 @@
fullpath = g_string_append(fullpath, outname->str);
fullpath = g_string_append(fullpath, "_%2c");
fullpath = g_string_append(fullpath, ".tif");
- parsed_filename = filename_parse(fullpath->str, first, 0);
+ parsed_filename = filename_parse(fullpath->str, first, 0, FALSE);
g_string_free(outname, TRUE);
g_string_free(fullpath, TRUE);
}
Modified: branches/4175-enfuse/src/rs-tethered-shooting.c
===================================================================
--- branches/4175-enfuse/src/rs-tethered-shooting.c 2012-08-25 09:44:15 UTC
(rev 4266)
+++ branches/4175-enfuse/src/rs-tethered-shooting.c 2012-08-25 10:15:44 UTC
(rev 4267)
@@ -457,7 +457,7 @@
g_string_append(filename_template, org_template);
g_string_append(filename_template, g_strrstr(tmp_name, "."));
- gchar* filename = filename_parse(g_string_free(filename_template,
FALSE),tmp_name, 0);
+ gchar* filename = filename_parse(g_string_free(filename_template,
FALSE),tmp_name, 0, TRUE);
GFile* src = g_file_new_for_path(tmp_name);
GFile* dst = g_file_new_for_path(filename);
@@ -785,7 +785,7 @@
gchar *final = "";
GtkLabel *example = GTK_LABEL(filename->example_label);
- parsed = filename_parse(filename->filename, "filename", 0);
+ parsed = filename_parse(filename->filename, "filename", 0, TRUE);
final = g_strdup_printf("%s.ext", parsed);
gtk_label_set_markup(example, final);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
