projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert mods made for HDR for out-of-range values greater than (0 - 1.0f)
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
file.C
diff --git
a/cinelerra-5.1/cinelerra/file.C
b/cinelerra-5.1/cinelerra/file.C
index 3202057403e7c2540e8f8db3174963da546283aa..90ad489f76a3307314789cab03035426f4d6e374 100644
(file)
--- a/
cinelerra-5.1/cinelerra/file.C
+++ b/
cinelerra-5.1/cinelerra/file.C
@@
-1,6
+1,7
@@
/*
* CINELERRA
* Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* 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
*
* 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
@@
-254,6
+255,10
@@
int File::get_options(FormatTools *format,
FileOGG::get_parameters(parent_window, asset, format_window,
audio_options, video_options, edl);
break;
FileOGG::get_parameters(parent_window, asset, format_window,
audio_options, video_options, edl);
break;
+ case FILE_VORBIS:
+ FileVorbis::get_parameters(parent_window, asset, format_window,
+ audio_options, video_options, edl);
+ break;
#endif
default:
break;
#endif
default:
break;
@@
-1666,7
+1671,14
@@
int File::record_fd()
void File::get_exe_path(char *result, char *bnp)
{
// Get executable path, basename
void File::get_exe_path(char *result, char *bnp)
{
// Get executable path, basename
+#if !defined(__FreeBSD__)
int len = readlink("/proc/self/exe", result, BCTEXTLEN-1);
int len = readlink("/proc/self/exe", result, BCTEXTLEN-1);
+#else
+ char exe_path[BCTEXTLEN];
+ sprintf(exe_path,"/proc/%d/file",getpid());
+ int len = readlink(exe_path, result, BCTEXTLEN-1);
+#endif
+
if( len >= 0 ) {
result[len] = 0;
char *ptr = strrchr(result, '/');
if( len >= 0 ) {
result[len] = 0;
char *ptr = strrchr(result, '/');