[CinCV TNG] [PATCH] Removed unused renderfarmfsserver.inc

Johannes Sixt j6t at kdbg.org
Tue Aug 8 22:57:26 CEST 2017


I am not very happy with the sequence of the patches:

Am 08.08.2017 um 18:47 schrieb Einar R√ľnkaru:
> Subject: [PATCH] Removed unused renderfarmfsserver.inc
> 
> Drop support of VFS
> ---
>   cinelerra/filelist.C             | 14 ++------------
>   cinelerra/renderfarm.C           |  4 ----
>   cinelerra/renderfarm.h           |  1 -
>   cinelerra/renderfarmfsserver.inc | 31 -------------------------------
>   4 files changed, 2 insertions(+), 48 deletions(-)
>   delete mode 100644 cinelerra/renderfarmfsserver.inc
> 
> diff --git a/cinelerra/filelist.C b/cinelerra/filelist.C
> index 2480350..7b317c6 100644
> --- a/cinelerra/filelist.C
> +++ b/cinelerra/filelist.C
> @@ -28,7 +28,6 @@
>   #include "mutex.h"
>   #include "mwindow.inc"
>   #include "render.h"
> -#include "renderfarmfsserver.inc"
>   #include "vframe.h"
>   #include "mainerror.h"
>   
> @@ -196,11 +195,7 @@ int FileList::write_list_header()
>   
>   	for(int i = 0; i < path_list.total; i++)
>   	{
> -// Fix path for VFS but leave leading slash
> -		if(!strncmp(path_list.values[i], RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)))
> -			sprintf(string, "%s\n", path_list.values[i] + strlen(RENDERFARM_FS_PREFIX));
> -		else
> -			sprintf(string, "%s\n", path_list.values[i]);
> +		sprintf(string, "%s\n", path_list.values[i]);
>   		fwrite(string, strlen(string), 1, stream);
>   	}
>   	fclose(stream);
> @@ -290,12 +285,7 @@ int FileList::read_frame(VFrame *frame)
>   		}
>   		FILE *in;
>   
> -
> -// Fix path for VFS
> -		if(!strncmp(asset->path, RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)))
> -			sprintf(string, "%s%s", RENDERFARM_FS_PREFIX, path);
> -		else
> -			strcpy(string, path);
> +		strcpy(string, path);
>   
>   		if(!(in = fopen(string, "rb")))
>   		{

The patch text up to here should be the first commit.

The remaining part should be included in the subsequent commit "Remove 
completely unused files".

> diff --git a/cinelerra/renderfarm.C b/cinelerra/renderfarm.C
> index f32dff4..3603d48 100644
> --- a/cinelerra/renderfarm.C
> +++ b/cinelerra/renderfarm.C
> @@ -363,10 +363,6 @@ void RenderFarmServerThread::run()
>   
>   	buffer = 0;
>   	buffer_allocated = 0;
> -//	fs_server = new RenderFarmFSServer(this);
> -//	fs_server->initialize();
> -
> -
>   
>   // Send command to run package renderer.
>   	write_int64(RENDERFARM_PACKAGES);
> diff --git a/cinelerra/renderfarm.h b/cinelerra/renderfarm.h
> index a01ce0d..130f3da 100644
> --- a/cinelerra/renderfarm.h
> +++ b/cinelerra/renderfarm.h
> @@ -37,7 +37,6 @@
>   #include "render.inc"
>   #include "renderfarm.inc"
>   #include "renderfarmclient.inc"
> -//#include "renderfarmfsserver.inc"
>   #include "thread.h"
>   
>   #include <stdint.h>
> diff --git a/cinelerra/renderfarmfsserver.inc b/cinelerra/renderfarmfsserver.inc
> deleted file mode 100644
> index 472a800..0000000
> --- a/cinelerra/renderfarmfsserver.inc
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -
> -/*
> - * CINELERRA
> - * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> - *
> - */
> -
> -#ifndef RENDERFARMFS_INC
> -#define RENDERFARMFS_INC
> -
> -
> -class RenderFarmFSServer;
> -#ifndef RENDERFARM_FS_PREFIX
> -#define RENDERFARM_FS_PREFIX "vfs://"
> -#endif
> -
> -#endif


More information about the Cinelerra mailing list