"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "f.gallery.cc" between
fotoxx-22.41.tar.gz and fotoxx-22.50.tar.gz

About: fotoxx is a program for photo editing and collection management.

f.gallery.cc  (fotoxx-22.41)	:	f.gallery.cc  (fotoxx-22.50)
skipping to change at line 902		skipping to change at line 902
if (gallerysort == FDATE) strncpy0(pdt,xxrec->fdate,15); // use file or photo date		if (gallerysort == FDATE) strncpy0(pdt,xxrec->fdate,15); // use file or photo date
else { // based on gallery sort		else { // based on gallery sort
convdate = 0;		convdate = 0;
strncpy0(pdt,xxrec->pdate,15); // photo date		strncpy0(pdt,xxrec->pdate,15); // photo date
if (xxrec->ww == 0) strcpy(pdt,"not indexed");		if (xxrec->ww == 0) strcpy(pdt,"not indexed");
else if (strmatch(pdt,"null")) strcpy(pdt,"undated");		else if (strmatch(pdt,"null")) strcpy(pdt,"undated");
else convdate = 1;		else convdate = 1;
}		}
if (convdate) {		if (convdate) {
memmove(pdt+17,pdt+12,2); // convert yyyymmddhhmmss		memmove(pdt+17,pdt+12,2); // convert yyyymmddhhmmss
memmove(pdt+14,pdt+10,2); // to yyyy-mm-dd hh:mm:ss		memmove(pdt+14,pdt+10,2); // to yyyy-mm-dd hh:mm:ss 22.50
memmove(pdt+11,pdt+8,2);		memmove(pdt+11,pdt+8,2);
memmove(pdt+8,pdt+6,2);		memmove(pdt+8,pdt+6,2);
memmove(pdt+5,pdt+4,2);		memmove(pdt+5,pdt+4,2);
pdt[19] = 0;		pdt[19] = 0;
pdt[16] = pdt[13] = ':';		pdt[16] = pdt[13] = ':';
pdt[10] =' ';		pdt[10] =' ';
pdt[4] = pdt[7] = '-';		pdt[4] = pdt[7] = '-';
if (thumbsize <= 256) pdt[10] = 0; // truncate date/time to date only		if (thumbsize <= 256) pdt[10] = 0; // truncate date/time to date only
}		}
skipping to change at line 1239		skipping to change at line 1239
snprintf(fsize,16,"%.2fmb",xxrec->fsize/FMEGA);		snprintf(fsize,16,"%.2fmb",xxrec->fsize/FMEGA);
tags = xxrec->tags;		tags = xxrec->tags;
title = xxrec->title;		title = xxrec->title;
desc = xxrec->desc;		desc = xxrec->desc;
location = xxrec->location;		location = xxrec->location;
country = xxrec->country;		country = xxrec->country;
pp = fdate; // file date		pp = fdate; // file date
memmove(pp+17,pp+12,2); // :ss added		memmove(pp+17,pp+12,2); // :ss added
memmove(pp+14,pp+10,2); // yyyymmddhhmmss to yyyy-mm-dd hh:mm:ss		memmove(pp+14,pp+10,2); // yyyymmddhhmmss to yyyy-mm-dd hh:mm:ss
memmove(pp+11,pp+8,2);		memmove(pp+11,pp+8,2); // 22.50
memmove(pp+8,pp+6,2);		memmove(pp+8,pp+6,2);
memmove(pp+5,pp+4,2);		memmove(pp+5,pp+4,2);
pp[19] = 0;		pp[19] = 0;
pp[16] = pp[13] = ':';		pp[16] = pp[13] = ':';
pp[10] =' ';		pp[10] =' ';
pp[4] = pp[7] = '-';		pp[4] = pp[7] = '-';
pp = pdate; // photo date		pp = pdate; // photo date
if (xxrec->ww == 0) strcpy(pp,"not indexed");		if (xxrec->ww == 0) strcpy(pp,"not indexed");
else if (strmatch(pp,"null")) strcpy(pp,"undated");		else if (strmatch(pp,"null")) strcpy(pp,"undated");
else {		else {
memmove(pp+17,pp+12,2); // :ss added		memmove(pp+17,pp+12,2); // :ss added
memmove(pp+14,pp+10,2); // yyyymmddhhmmss to yyyy-mm-dd hh:mm:ss		memmove(pp+14,pp+10,2); // yyyymmddhhmmss to yyyy-mm-dd hh:mm:ss
memmove(pp+11,pp+8,2);		memmove(pp+11,pp+8,2); // 22.50
memmove(pp+8,pp+6,2);		memmove(pp+8,pp+6,2);
memmove(pp+5,pp+4,2);		memmove(pp+5,pp+4,2);
pp[19] = 0;		pp[19] = 0;
pp[16] = pp[13] = ':';		pp[16] = pp[13] = ':';
pp[10] =' ';		pp[10] =' ';
pp[4] = pp[7] = '-';		pp[4] = pp[7] = '-';
}		}
if (! strmatchN(xxrec->xmeta,"null",4)) // extra indexed metadata present 22.40		if (! strmatchN(xxrec->xmeta,"null",4)) // extra indexed metadata present 22.40
{		{
skipping to change at line 4467		skipping to change at line 4467
if (rootname) zfree(rootname); // free last rootname		if (rootname) zfree(rootname); // free last rootname
if (filelist) { // free last file list		if (filelist) { // free last file list
for (jj = 0; jj < nfl; jj++)		for (jj = 0; jj < nfl; jj++)
zfree(filelist[jj]);		zfree(filelist[jj]);
zfree(filelist);		zfree(filelist);
}		}
zstrcopy(curr_album,albumfile,"albums"); // make current album		zstrcopy(curr_album,albumfile,"albums"); // make current album
zmessage_post(Mwin,"20/20",3,"new album created");		zmessage_post_bold(Mwin,"20/20",3,"new album created");
album_show();		album_show();
return;		return;
}		}
// dialog event and completion function		// dialog event and completion function
int gallery_screen_dialog_event(zdialog *zd, cchar *event) // 22.35		int gallery_screen_dialog_event(zdialog *zd, cchar *event) // 22.35
{		{
using namespace gallery_screen_names;		using namespace gallery_screen_names;
skipping to change at line 4888		skipping to change at line 4888
}		}
err = rename(oldname,newname); // do folder rename		err = rename(oldname,newname); // do folder rename
if (err) {		if (err) {
zmessageACK(Mwin,"rename failed: %s",strerror(errno));		zmessageACK(Mwin,"rename failed: %s",strerror(errno));
return;		return;
}		}
zmessageACK(Mwin,"folder renamed: \n %s",newname);		zmessageACK(Mwin,"folder renamed: \n %s",newname);
zmessage_post(Mwin,"parent",3,"updating index and albums");		zmessage_post_bold(Mwin,"parent",3,"updating index and albums");
zmainsleep(3);		zmainsleep(3);
m_quick_index(0,0); // re-index after folder rename		m_quick_index(0,0); // re-index after folder rename
album_folder_rename(oldname,newname); // update filenames in album files		album_folder_rename(oldname,newname); // update filenames in album files
gallery(newname,"init",0); // refresh gallery		gallery(newname,"init",0); // refresh gallery
gallery(0,"paint",-1);		gallery(0,"paint",-1);
return;		return;
}		}
skipping to change at line 5441		skipping to change at line 5441
zdialog_fetch(zd,"seconds",seconds);		zdialog_fetch(zd,"seconds",seconds);
seconds = 60 * minutes + seconds;		seconds = 60 * minutes + seconds;
zdialog_free(zd);		zdialog_free(zd);
snprintf(framefile,200,"%s/videoframe.jpg",temp_folder); // get frame file from ffmpeg		snprintf(framefile,200,"%s/videoframe.jpg",temp_folder); // get frame file from ffmpeg
err = zshell("ack","ffmpeg -ss %d -i \"%s\" -v 8 -frames 1 -y \"%s\" ",		err = zshell("ack","ffmpeg -ss %d -i \"%s\" -v 8 -frames 1 -y \"%s\" ",
seconds, videofile, framefile);		seconds, videofile, framefile);
if (err) goto cleanup;		if (err) goto cleanup;
if (! regfile(framefile)) {		if (! regfile(framefile)) {
zmessageACK(Mwin,"cannot create frame file: %s",strerror(errno));		zmessageACK(Mwin,"cannot get video frame: %s",strerror(errno));
goto cleanup;		goto cleanup;
}		}
err = image2thumbfile2(videofile,thumbfile); // get thumbnail file for video file		err = image2thumbfile2(videofile,thumbfile); // get thumbnail file for video file
if (err) {		if (err) {
zmessageACK(Mwin,"cannot create thumbnail file");		zmessageACK(Mwin,"cannot create thumbnail file");
goto cleanup;		goto cleanup;
}		}
pp = strrchr(thumbfile+1,'/');		pp = strrchr(thumbfile+1,'/');
End of changes. 6 change blocks.
6 lines changed or deleted		6 lines changed or added

---