projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
filesndfile.C
diff --git
a/cinelerra-5.1/cinelerra/filesndfile.C
b/cinelerra-5.1/cinelerra/filesndfile.C
index 198f938594c0c07592952fc20f8022f21c818115..9351378b97e4a7f1a2d09f75c04155f3532c733f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/filesndfile.C
+++ b/
cinelerra-5.1/cinelerra/filesndfile.C
@@
-154,6
+154,7
@@
void FileSndFile::format_to_asset()
case SF_FORMAT_AIFF: asset->format = FILE_AIFF; break;
case SF_FORMAT_AU: asset->format = FILE_AU; break;
case SF_FORMAT_RAW: asset->format = FILE_PCM; break;
case SF_FORMAT_AIFF: asset->format = FILE_AIFF; break;
case SF_FORMAT_AU: asset->format = FILE_AU; break;
case SF_FORMAT_RAW: asset->format = FILE_PCM; break;
+ default:
case SF_FORMAT_PAF: asset->format = FILE_SND; break;
case SF_FORMAT_SVX: asset->format = FILE_SND; break;
case SF_FORMAT_NIST: asset->format = FILE_SND; break;
case SF_FORMAT_PAF: asset->format = FILE_SND; break;
case SF_FORMAT_SVX: asset->format = FILE_SND; break;
case SF_FORMAT_NIST: asset->format = FILE_SND; break;
@@
-355,10
+356,8
@@
int FileSndFile::write_samples(double **buffer, int64_t len)
}
void FileSndFile::get_parameters(BC_WindowBase *parent_window,
}
void FileSndFile::get_parameters(BC_WindowBase *parent_window,
- Asset *asset,
- BC_WindowBase* &format_window,
- int audio_options,
- int video_options)
+ Asset *asset, BC_WindowBase* &format_window,
+ int audio_options, int video_options, EDL *edl)
{
if(audio_options)
{
{
if(audio_options)
{
@@
-393,7
+392,7
@@
SndFileConfig::~SndFileConfig()
void SndFileConfig::create_objects()
{
void SndFileConfig::create_objects()
{
- lock_window("SndFileConfig::create_objects
()
");
+ lock_window("SndFileConfig::create_objects");
int x = 10, y = 10;
bits_popup = 0;
int x = 10, y = 10;
bits_popup = 0;