Changeset 15279

Timestamp:

04/16/12 00:37:59 (10 years ago)

Author:

nit

Message:

[titan] update thump

Location:

titan/titan

Files:

• filelist.h (modified) (3 diffs)
• thump.h (modified) (1 diff)

titan/titan/filelist.h

@@ -464 +464 @@
                                                 tmpstr = ostrcat(tmpstr, filename, 1, 0);
                                                 free(filename); filename = NULL;
-                                                child->filelist->imdbpath = tmpstr;
                                                 debug(10, "imdbpath: %s", tmpstr);
-// double free error, why ?
-//                                              free(tmpstr); tmpstr = NULL;                                            
+                                                //tmpstr is freed with imdbpath
+                                                child->filelist->imdbpath = tmpstr;                                             
                                         }
 
@@ -570 +569 @@
                                                         debug(10, "files: change pic");
                                                         if(cmpfilenameext(filelist[i]->d_name, ".jpg") == 0)
+                                                        {
+                                                                char* thumpfile = NULL;
+                                                                if(status.createthump == 1)
+                                                                {
+                                                                        //check if thump exists
+                                                                        char* tmpfile = ostrcat(createpath(node->input, "/"), tmpstr, 1, 0);
+                                                                        thumpfile = checkthump(tmpfile);
+                                                                        if(thumpfile != NULL)
+                                                                        {
+                                                                                free(tmpstr);
+                                                                                tmpstr = thumpfile;
+                                                                        }
+                                                                        free(tmpfile); tmpfile = NULL;
+                                                                }
                                                                 changepic(child, tmpstr);
-                                                        else
-                                                                changepicmem(child, tmpstr,pagecount + 1000);
+                                                        }
                                                         free(tmpstr); tmpstr = NULL;
                                                 }
@@ -647 +659 @@
                                                         free(filename); filename = NULL;
                                                         debug(10, "imdbpath: %s", tmpstr);
+                                                        //tmpstr is freed with imdbpath
                                                         child->filelist->imdbpath = tmpstr;
-// double free error, why ?
-//                                                      free(tmpstr); tmpstr = NULL;
                                                 }
 

titan/titan/thump.h

@@ -1 +1 @@
 #ifndef TRANSPONDER_H
 #define TRANSPONDER_H
+
+char* checkthump(char* file)
+{
+        return ostrcat(file, ".thump", 0, 0);
+}
 
 void thumpthread(struct stimerthread* self)