From: Good Guy Date: Tue, 24 Oct 2017 14:51:56 +0000 (-0600) Subject: sams ff_audio icons, thirdparty/Makefile tweak, intl tweaks, firewire segvs X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=a9288f4aa494cc2e76d5eb2f54e2a7561c4a35b4;p=goodguy%2Fhistory.git sams ff_audio icons, thirdparty/Makefile tweak, intl tweaks, firewire segvs --- diff --git a/cinelerra-5.1/cinelerra/audioidevice.C b/cinelerra-5.1/cinelerra/audioidevice.C index 65874ddd..acc87057 100644 --- a/cinelerra-5.1/cinelerra/audioidevice.C +++ b/cinelerra-5.1/cinelerra/audioidevice.C @@ -200,6 +200,7 @@ while( is_recording ) { else { --input_buffer_count; printf("AudioDevice::run_input: buffer overflow\n"); + result = 1; } ibfr = &input[input_buffer_in]; ibfr->size = 0; @@ -208,7 +209,7 @@ while( is_recording ) { buffer_lock->unlock(); polling_lock->unlock(); } - else { + if( result ) { perror("AudioDevice::run_input"); usleep(250000); } diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index e64adff9..b93b354e 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -553,7 +553,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un void AWindowGUI::create_objects() { lock_window("AWindowGUI::create_objects"); - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); set_icon(mwindow->theme->get_image("awindow_icon")); @@ -1222,7 +1222,7 @@ void AWindowGUI::sort_picons(ArrayList *src) void AWindowGUI::filter_displayed_assets() { //allow_iconlisting = 1; - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); switch( mwindow->edl->session->awindow_folder ) { @@ -1241,7 +1241,7 @@ void AWindowGUI::filter_displayed_assets() case AW_LABEL_FOLDER: copy_picons(displayed_assets, &labellist, AW_NO_FOLDER); asset_titles[0] = _("Time Stamps"); - asset_titles[1] = _("Title"); + asset_titles[1] = C_("Title"); //allow_iconlisting = 0; break; default: diff --git a/cinelerra-5.1/cinelerra/device1394input.C b/cinelerra-5.1/cinelerra/device1394input.C index 337bdb29..88aae8a6 100644 --- a/cinelerra-5.1/cinelerra/device1394input.C +++ b/cinelerra-5.1/cinelerra/device1394input.C @@ -126,59 +126,53 @@ int Device1394Input::open(const char *path, // Initialize grabbing - if(fd < 0) - { - if((fd = ::open(path, O_RDWR)) < 0) - { - printf("Device1394Input::open %s: %s\n", path, strerror(errno)); - } - else - { + if(fd < 0 && (fd = ::open(path, O_RDWR)) < 0) { + printf("Device1394Input::open %s: %s\n", path, strerror(errno)); + result = 1; + } + if( !result ) { #define CIP_N_NTSC 68000000 #define CIP_D_NTSC 1068000000 - #define CIP_N_PAL 1 #define CIP_D_PAL 16 - - struct dv1394_init init = - { - api_version: DV1394_API_VERSION, - channel: (unsigned int)channel, - n_frames: (unsigned int)length, - format: is_pal ? DV1394_PAL: DV1394_NTSC, - cip_n: 0, - cip_d: 0, - syt_offset: 0 - }; - if(ioctl(fd, DV1394_IOC_INIT, &init) < 0) - { - printf("Device1394Input::open DV1394_IOC_INIT: %s\n", strerror(errno)); - } - - input_buffer = (unsigned char*)mmap(0, - length * buffer_size, - PROT_READ | PROT_WRITE, - MAP_SHARED, - fd, - 0); - - if(ioctl(fd, DV1394_IOC_START_RECEIVE, 0) < 0) - { - perror("Device1394Input::open DV1394_START_RECEIVE"); - } + struct dv1394_init init = { + api_version: DV1394_API_VERSION, + channel: (unsigned int)channel, + n_frames: (unsigned int)length, + format: is_pal ? DV1394_PAL: DV1394_NTSC, + cip_n: 0, + cip_d: 0, + syt_offset: 0 + }; + if(ioctl(fd, DV1394_IOC_INIT, &init) < 0) { + printf("Device1394Input::open DV1394_IOC_INIT: %s\n", strerror(errno)); + result = 1; } + } + if( !result ) { + input_buffer = (unsigned char*)mmap(0, length * buffer_size, + PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if( input_buffer == MAP_FAILED ) { + perror("Device1394Input::open mmap"); + input_buffer = 0; + result = 1; + } + } + if( !result ) { + if(ioctl(fd, DV1394_IOC_START_RECEIVE, 0) < 0) { + perror("Device1394Input::open DV1394_START_RECEIVE"); + result = 1; + } + } - - + if( !result ) { buffer = new char*[total_buffers]; buffer_valid = new int[total_buffers]; bzero(buffer_valid, sizeof(int) * total_buffers); - for(int i = 0; i < total_buffers; i++) - { + for(int i = 0; i < total_buffers; i++) { buffer[i] = new char[DV_PAL_SIZE]; } - audio_buffer = new char[INPUT_SAMPLES * 2 * channels]; audio_lock = new Condition(0, "Device1394Input::audio_lock"); video_lock = new Condition(0, "Device1394Input::video_lock"); @@ -195,24 +189,28 @@ void Device1394Input::run() { while(!done) { + int ret = 0; // Wait for frame to arrive struct dv1394_status status; printf("Device1394Input::run %d done=%d\n", __LINE__, done); Thread::enable_cancel(); - if(ioctl(fd, DV1394_IOC_WAIT_FRAMES, 1)) - { + if(ioctl(fd, DV1394_IOC_WAIT_FRAMES, 1)) { perror("Device1394Input::run DV1394_IOC_WAIT_FRAMES"); - sleep(1); + ret = 1; } - else - if(ioctl(fd, DV1394_IOC_GET_STATUS, &status)) - { + else if(ioctl(fd, DV1394_IOC_GET_STATUS, &status)) { perror("Device1394Input::run DV1394_IOC_GET_STATUS"); + ret = 1; + } + else if( !input_buffer ) { + fprintf(stderr, "Device1394Input::run !input_buffer"); + ret = 1; } + if( ret ) + sleep(1); Thread::disable_cancel(); - - + if( ret ) continue; buffer_lock->lock("Device1394Input::run 1"); diff --git a/cinelerra-5.1/picon_cinfinity/ff_abench.png b/cinelerra-5.1/picon_cinfinity/ff_abench.png new file mode 100644 index 00000000..3fdb9893 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_abench.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_acompressor.png b/cinelerra-5.1/picon_cinfinity/ff_acompressor.png new file mode 100644 index 00000000..a9722fab Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_acompressor.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_acrusher.png b/cinelerra-5.1/picon_cinfinity/ff_acrusher.png new file mode 100644 index 00000000..34ffd210 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_acrusher.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_adelay.png b/cinelerra-5.1/picon_cinfinity/ff_adelay.png new file mode 100644 index 00000000..4b191c90 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_adelay.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aecho.png b/cinelerra-5.1/picon_cinfinity/ff_aecho.png new file mode 100644 index 00000000..50b9e6d4 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aecho.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aemphasis.png b/cinelerra-5.1/picon_cinfinity/ff_aemphasis.png new file mode 100644 index 00000000..765169ba Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aemphasis.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aeval.png b/cinelerra-5.1/picon_cinfinity/ff_aeval.png new file mode 100644 index 00000000..637c9009 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aeval.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_afade.png b/cinelerra-5.1/picon_cinfinity/ff_afade.png new file mode 100644 index 00000000..dd7d3ad9 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_afade.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_agate.png b/cinelerra-5.1/picon_cinfinity/ff_agate.png new file mode 100644 index 00000000..35a78c8a Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_agate.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_allpass.png b/cinelerra-5.1/picon_cinfinity/ff_allpass.png new file mode 100644 index 00000000..2da7b65e Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_allpass.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aloop.png b/cinelerra-5.1/picon_cinfinity/ff_aloop.png new file mode 100644 index 00000000..d24b62e0 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aloop.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aperms.png b/cinelerra-5.1/picon_cinfinity/ff_aperms.png new file mode 100644 index 00000000..bb607589 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aperms.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aphaser.png b/cinelerra-5.1/picon_cinfinity/ff_aphaser.png new file mode 100644 index 00000000..aebbb169 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aphaser.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_arealtime.png b/cinelerra-5.1/picon_cinfinity/ff_arealtime.png new file mode 100644 index 00000000..4c71cfb5 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_arealtime.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_aresample.png b/cinelerra-5.1/picon_cinfinity/ff_aresample.png new file mode 100644 index 00000000..68436606 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_aresample.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_astats.png b/cinelerra-5.1/picon_cinfinity/ff_astats.png new file mode 100644 index 00000000..884e7c2e Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_astats.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_atempo.png b/cinelerra-5.1/picon_cinfinity/ff_atempo.png new file mode 100644 index 00000000..b8710722 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_atempo.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_atrim.png b/cinelerra-5.1/picon_cinfinity/ff_atrim.png new file mode 100644 index 00000000..6374b2c4 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_atrim.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_bandpass.png b/cinelerra-5.1/picon_cinfinity/ff_bandpass.png new file mode 100644 index 00000000..0c9016d6 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_bandpass.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_bandreject.png b/cinelerra-5.1/picon_cinfinity/ff_bandreject.png new file mode 100644 index 00000000..17f723fb Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_bandreject.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_bass.png b/cinelerra-5.1/picon_cinfinity/ff_bass.png new file mode 100644 index 00000000..203fd31a Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_bass.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_biquad.png b/cinelerra-5.1/picon_cinfinity/ff_biquad.png new file mode 100644 index 00000000..eaba8d6b Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_biquad.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_chorus.png b/cinelerra-5.1/picon_cinfinity/ff_chorus.png new file mode 100644 index 00000000..7c0dd299 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_chorus.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_compand.png b/cinelerra-5.1/picon_cinfinity/ff_compand.png new file mode 100644 index 00000000..bf750f37 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_compand.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_compensationdelay.png b/cinelerra-5.1/picon_cinfinity/ff_compensationdelay.png new file mode 100644 index 00000000..f1802a28 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_compensationdelay.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_crystalizer.png b/cinelerra-5.1/picon_cinfinity/ff_crystalizer.png new file mode 100644 index 00000000..0410f9e4 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_crystalizer.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_dcshift.png b/cinelerra-5.1/picon_cinfinity/ff_dcshift.png new file mode 100644 index 00000000..201e6ecb Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_dcshift.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_dynaudnorm.png b/cinelerra-5.1/picon_cinfinity/ff_dynaudnorm.png new file mode 100644 index 00000000..422d03cf Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_dynaudnorm.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_earwax.png b/cinelerra-5.1/picon_cinfinity/ff_earwax.png new file mode 100644 index 00000000..59dbcb79 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_earwax.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_equalizer.png b/cinelerra-5.1/picon_cinfinity/ff_equalizer.png new file mode 100644 index 00000000..08f98925 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_equalizer.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_extrastereo.png b/cinelerra-5.1/picon_cinfinity/ff_extrastereo.png new file mode 100644 index 00000000..bff6243f Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_extrastereo.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_flanger.png b/cinelerra-5.1/picon_cinfinity/ff_flanger.png new file mode 100644 index 00000000..deae9ff9 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_flanger.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_highpass.png b/cinelerra-5.1/picon_cinfinity/ff_highpass.png new file mode 100644 index 00000000..c445a250 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_highpass.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_loudnorm.png b/cinelerra-5.1/picon_cinfinity/ff_loudnorm.png new file mode 100644 index 00000000..a91c9b97 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_loudnorm.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_lowpass.png b/cinelerra-5.1/picon_cinfinity/ff_lowpass.png new file mode 100644 index 00000000..19a62c04 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_lowpass.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_silenceremove.png b/cinelerra-5.1/picon_cinfinity/ff_silenceremove.png new file mode 100644 index 00000000..efc6c9e3 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_silenceremove.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_sine.png b/cinelerra-5.1/picon_cinfinity/ff_sine.png new file mode 100644 index 00000000..de4b41a8 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_sine.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereotools.png b/cinelerra-5.1/picon_cinfinity/ff_stereotools.png new file mode 100644 index 00000000..405b5d69 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_stereotools.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereowiden.png b/cinelerra-5.1/picon_cinfinity/ff_stereowiden.png new file mode 100644 index 00000000..9235f2da Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_stereowiden.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_treble.png b/cinelerra-5.1/picon_cinfinity/ff_treble.png new file mode 100644 index 00000000..bdbc2b98 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_treble.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_tremolo.png b/cinelerra-5.1/picon_cinfinity/ff_tremolo.png new file mode 100644 index 00000000..fc083941 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_tremolo.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_vibrato.png b/cinelerra-5.1/picon_cinfinity/ff_vibrato.png new file mode 100644 index 00000000..34285f48 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_vibrato.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_volume.png b/cinelerra-5.1/picon_cinfinity/ff_volume.png new file mode 100644 index 00000000..5d592e51 Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_volume.png differ diff --git a/cinelerra-5.1/picon_cinfinity/ff_volumedetect.png b/cinelerra-5.1/picon_cinfinity/ff_volumedetect.png new file mode 100644 index 00000000..fa94d68f Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_volumedetect.png differ diff --git a/cinelerra-5.1/plugins/timefront/timefront.C b/cinelerra-5.1/plugins/timefront/timefront.C index 2bb074fa..76cdcd44 100644 --- a/cinelerra-5.1/plugins/timefront/timefront.C +++ b/cinelerra-5.1/plugins/timefront/timefront.C @@ -512,7 +512,7 @@ char* TimeFrontRate::to_text(int shape) case TimeFrontConfig::LOG: return _("Log"); default: - return _("Square"); + return C_("Square"); } } int TimeFrontRate::from_text(char *text) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 4d3c1457..75a552e4 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -50,8 +50,9 @@ unpack_bz2=tar -xjf $(1) unpack_xz=tar -xJf $(1) bld_depends=$(if $(ver_$(1)),$(call pkg-built,$(1))) bld_path=$(ver_$(1))/$(2) -inc_path=$(inc_$(1)) -ld_path=$(if $(ver_$(1)),-L$(call bld_path,$(1),$(2)) $(lib_$(1))) +if_pkg=$(if $(ver_$(1)),$(2)) +inc_path=$(call if_pkg,$(1),$(inc_$(1))) +ld_path=$(call if_pkg,$(1),-L$(call bld_path,$(1),$(2)) $(lib_$(1))) #$(eval $(call std-build,pkg,deps...)) #$(pkg.cflags) added as CFLAGS+=$(cflags) to pkg.vars @@ -114,19 +115,17 @@ ffmpeg.cfg_params= \ --enable-pthreads --enable-gpl \ --disable-ffserver --disable-ffplay \ --disable-vaapi \ - --enable-libfdk-aac \ - --enable-libtwolame \ - --enable-libopenjpeg \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libtheora \ - --enable-libvpx \ - --enable-libx264 \ - --enable-libx265 \ + $(call if_pkg,fdk,--enable-libfdk-aac) \ + $(call if_pkg,twolame,--enable-libtwolame) \ + $(call if_pkg,openjpeg,--enable-libopenjpeg) \ + $(call if_pkg,lame,--enable-libmp3lame) \ + $(call if_pkg,libvorbis,--enable-libvorbis) \ + $(call if_pkg,libtheora,--enable-libtheora) \ + $(call if_pkg,libvpx,--enable-libvpx) \ + $(call if_pkg,x264,--enable-libx264) \ + $(call if_pkg,x265,--enable-libx265) \ --enable-nonfree \ --extra-cflags="\ - $(call inc_path,faad2,include) \ - $(call inc_path,faac,include) \ $(call inc_path,twolame,libtwolame) \ $(call inc_path,lame,include) \ $(call inc_path,openjpeg,src/lib/openjp2) \