From af9da8c781a5b006df29a4ebfbeb5f9414109977 Mon Sep 17 00:00:00 2001 From: Herman Robak Date: Mon, 10 Nov 2003 02:39:12 +0000 Subject: [PATCH] r123: Merged HEAD and TEST. New stuff shall be committed to HEAD from now on. --- Makefile.am | 8 ++ cinelerra/Makefile.am | 19 ++-- cinelerra/adeviceprefs.C | 35 +++++++ cinelerra/adeviceprefs.h | 11 +++ cinelerra/audio1394.C | 3 +- cinelerra/device1394output.C | 181 +++++++++++++++++++++++++++------- cinelerra/device1394output.h | 6 +- cinelerra/playbackconfig.C | 19 +++- cinelerra/playbackconfig.h | 2 + cinelerra/preferences.C | 2 +- cinelerra/renderfarmfsclient.C | 3 +- cinelerra/vdevice1394.C | 3 +- cinelerra/vdeviceprefs.C | 20 ++++ cinelerra/vdeviceprefs.h | 1 + config.h.in | 22 ++++- configure.in | 6 +- guicast/Makefile.am | 16 +++- libmpeg3/Makefile.am | 17 +++- libmpeg3/audio/Makefile.am | 5 +- libmpeg3/video/Makefile.am | 9 +- mpeg2enc/Makefile.am | 16 +++- mplexhi/Makefile.am | 2 +- mplexlo/Makefile.am | 2 +- plugins/1080to480/Makefile.am | 3 + plugins/720to480/Makefile.am | 2 + plugins/Makefile.am | 22 ++++- plugins/aging/Makefile.am | 5 +- plugins/bandslide/Makefile.am | 3 + plugins/bandwipe/Makefile.am | 3 + plugins/blur/Makefile.am | 3 + plugins/blurzoom/Makefile.am | 3 + plugins/brightness/Makefile.am | 5 +- plugins/burn/Makefile.am | 5 +- plugins/cdripper/Makefile.am | 2 + plugins/chromakey/Makefile.am | 5 +- plugins/colorbalance/Makefile.am | 5 +- plugins/colors/Makefile.am | 2 + plugins/compressor/Makefile.am | 3 + plugins/crossfade/Makefile.am | 3 + plugins/defaulttheme/Makefile.am | 24 +++++ plugins/deinterlace/Makefile.am | 3 + plugins/delayaudio/Makefile.am | 3 + plugins/delayvideo/Makefile.am | 3 + plugins/denoise/Makefile.am | 3 + plugins/denoisefft/Makefile.am | 5 +- plugins/denoisemjpeg/Makefile.am | 3 + plugins/denoisevideo/Makefile.am | 3 + plugins/despike/Makefile.am | 3 + plugins/dissolve/Makefile.am | 3 + plugins/dot/Makefile.am | 5 +- plugins/downsample/Makefile.am | 3 + plugins/fieldframe/Makefile.am | 3 + plugins/flash/Makefile.am | 3 + plugins/flip/Makefile.am | 3 + plugins/fonts/Makefile.am | 7 +- plugins/fourier/Makefile.am | 2 + plugins/framefield/Makefile.am | 3 + plugins/freeverb/Makefile.am | 11 ++- plugins/freezeframe/Makefile.am | 3 + plugins/gain/Makefile.am | 3 + plugins/gradient/Makefile.am | 7 +- plugins/histogram/Makefile.am | 5 +- plugins/holo/Makefile.am | 5 +- plugins/huesaturation/Makefile.am | 5 +- plugins/invertaudio/Makefile.am | 3 + plugins/invertvideo/Makefile.am | 5 +- plugins/irissquare/Makefile.am | 3 + plugins/ivtc/Makefile.am | 3 + plugins/lame/Makefile.am | 2 + plugins/level/Makefile.am | 3 + plugins/libcolors/Makefile.am | 2 + plugins/libeffecttv/Makefile.am | 2 + plugins/libfourier/Makefile.am | 2 + plugins/linearblur/Makefile.am | 3 + plugins/microtheme/Makefile.am | 23 +++++ plugins/motion/Makefile.am | 3 + plugins/normalize/Makefile.am | 3 + plugins/oilpainting/Makefile.am | 3 + plugins/parametric/Makefile.am | 5 +- plugins/perspective/Makefile.am | 3 + plugins/pitch/Makefile.am | 5 +- plugins/polar/Makefile.am | 3 + plugins/quark/Makefile.am | 3 + plugins/radialblur/Makefile.am | 3 + plugins/reframe/Makefile.am | 3 + plugins/resample/Makefile.am | 3 + plugins/reverb/Makefile.am | 3 + plugins/reverseaudio/Makefile.am | 2 + plugins/reversevideo/Makefile.am | 2 + plugins/rgb601/Makefile.am | 3 + plugins/rotate/Makefile.am | 3 + plugins/scale/Makefile.am | 3 + plugins/sharpen/Makefile.am | 3 + plugins/shiftinterlace/Makefile.am | 3 + plugins/slide/Makefile.am | 3 + plugins/spectrogram/Makefile.am | 3 + plugins/svg/Makefile.am | 3 + plugins/swapchannels/Makefile.am | 3 + plugins/synthesizer/Makefile.am | 3 + plugins/timeavg/Makefile.am | 3 + plugins/timestretch/Makefile.am | 3 + plugins/titler/Makefile.am | 5 +- plugins/toolame/Makefile.am | 2 + plugins/translate/Makefile.am | 3 + plugins/videoscope/Makefile.am | 5 +- plugins/wave/Makefile.am | 3 + plugins/whirl/Makefile.am | 3 + plugins/wipe/Makefile.am | 3 + plugins/yuv/Makefile.am | 5 +- plugins/zoomblur/Makefile.am | 3 + po/de.po | 155 +++++++++++++++--------------- po/sl.po | 192 +++++++++++-------------------------- quicktime/Makefile.am | 58 ++++++++++- quicktime/decore50/Makefile.am | 24 ++++- quicktime/encore50/Makefile.am | 25 +++++ toolame-02l/Makefile.am | 33 +++++++ 116 files changed, 936 insertions(+), 317 deletions(-) rewrite plugins/fonts/Makefile.am (89%) diff --git a/Makefile.am b/Makefile.am index 542074dd..195a0173 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,11 @@ SUBDIRS=libmpeg3 quicktime mpeg2enc toolame-02l guicast cinelerra mplexhi mplexlo plugins po +EXTRA_DIST = admin debian doc m4 depcomp README.BUILD AUTOMAKE_OPTIONS=foreign ACLOCAL_AMFLAGS = -I m4 + +dist-hook: + -rm -rf $(distdir)/admin/CVS + -rm -rf $(distdir)/debian/tmp + -rm -rf $(distdir)/debian/CVS + -rm -rf $(distdir)/debian/patches/CVS + -rm -rf $(distdir)/doc/CVS diff --git a/cinelerra/Makefile.am b/cinelerra/Makefile.am index aa4b5245..23654435 100644 --- a/cinelerra/Makefile.am +++ b/cinelerra/Makefile.am @@ -253,8 +253,8 @@ cinelerra_SOURCES = aattachmentpoint.C \ INCLUDES = -I$(top_srcdir)/quicktime -I$(top_srcdir)/guicast -I$(top_srcdir)/libmpeg3 $(all_includes) # the library search path. -cinelerra_CFLAGS = $(CFLAGS) $(FIREWIRE_CFLAGS) $(SOUND_CFLAGS) $(AVIFILE_CXXFLAGS) -cinelerra_CXXFLAGS = $(CXXFLAGS) $(FIREWIRE_CFLAGS) $(SOUND_CFLAGS) $(AVIFILE_CXXFLAGS) +cinelerra_CFLAGS = $(CFLAGS) $(FIREWIRE_CFLAGS) $(SOUND_CFLAGS) $(AVIFILE_CXXFLAGS) +cinelerra_CXXFLAGS = $(CXXFLAGS) $(FIREWIRE_CFLAGS) $(SOUND_CFLAGS) $(AVIFILE_CXXFLAGS) -DPLUGINDIR=\"$(libdir)/cinelerra/\" cinelerra_LDFLAGS = -export-dynamic ../mpeg2enc/libmpeg2enc.la ../toolame-02l/libtoolame.la AM_CFLAGS = AM_CXXFLAGS = @@ -345,10 +345,8 @@ noinst_HEADERS = aattachmentpoint.h \ fileavi.h \ filebase.h \ fileformat.h \ - filegif.h \ file.h \ filejpeg.h \ - filejpeglist.h \ filelist.h \ filemov.h \ filempeg.h \ @@ -359,7 +357,6 @@ noinst_HEADERS = aattachmentpoint.h \ filetiff.h \ filevorbis.h \ filexml.h \ - flipbook.h \ floatauto.h \ floatautos.h \ formatcheck.h \ @@ -432,7 +429,6 @@ noinst_HEADERS = aattachmentpoint.h \ plugincommands.h \ plugindialog.h \ plugin.h \ - pluginmessages.h \ pluginpopup.h \ pluginprefs.h \ pluginserver.h \ @@ -459,7 +455,6 @@ noinst_HEADERS = aattachmentpoint.h \ recordtransport.h \ recordvideo.h \ recordwindow.h \ - reindex.h \ renderengine.h \ renderfarmclient.h \ renderfarmfsclient.h \ @@ -492,7 +487,6 @@ noinst_HEADERS = aattachmentpoint.h \ timebar.h \ timebomb.h \ timeentry.h \ - toggleauto.h \ toggleautos.h \ trackcanvas.h \ track.h \ @@ -548,6 +542,13 @@ noinst_HEADERS = aattachmentpoint.h \ vwindow.h \ workarounds.h \ zoombar.h \ - zoompanel.h + zoompanel.h \ + $(srcdir)/*.inc cinelerra_LDADD = $(top_builddir)/quicktime/libquicktime.la $(top_builddir)/guicast/libguicast.la $(top_builddir)/libmpeg3/libmpeg3.la -lX11 -lsndfile -logg -lvorbis -lvorbisfile -lvorbisenc -la52 -lpng -lXv -lXext -ljpeg -lmp3lame -ltiff -lesd -lz $(SOUND_LDFLAGS) $(FIREWIRE_LDFLAGS) -ldv -luuid $(AVIFILE_LDFLAGS) + +EXTRA_DIST = Blond data + +dist-hook: + -rm -rf $(distdir)/Blond/CVS + -rm -rf $(distdir)/data/CVS diff --git a/cinelerra/adeviceprefs.C b/cinelerra/adeviceprefs.C index 6d5e1ba1..916392ad 100644 --- a/cinelerra/adeviceprefs.C +++ b/cinelerra/adeviceprefs.C @@ -36,6 +36,7 @@ ADevicePrefs::ADevicePrefs(int x, firewire_channels = 0; firewire_path = 0; firewire_syt = 0; + firewire_use_dv1394 = 0; syt_title = 0; channels_title = 0; path_title = 0; @@ -174,6 +175,11 @@ int ADevicePrefs::delete_firewire_objs() delete channels_title; } firewire_channels = 0; + if(firewire_use_dv1394) + { + delete firewire_use_dv1394; + } + firewire_use_dv1394 = 0; return 0; } @@ -503,6 +509,24 @@ int ADevicePrefs::create_firewire_objs() x1 += firewire_syt->get_w() + 5; } + x1 = x + menu->get_w() + 5; + + switch(mode) + { + case MODEPLAY: + output_int = &out_config->firewire_use_dv1394; + break; + case MODERECORD: + output_int = 0; + break; + } + + if(output_int) + { + dialog->add_subwindow(firewire_use_dv1394 = + new BC_CheckBox(x1, y + 45, output_int, _("Use DV1394"))); + } + return 0; } @@ -623,6 +647,17 @@ int ADeviceIntBox::handle_event() return 1; } +ADeviceCheckBox::ADeviceCheckBox(int x, int y, int *output, char *text) + : BC_CheckBox(x, y, *output, text) +{ + this->output = output; +} +int ADeviceCheckBox::handle_event() +{ + *output = get_value(); + return 1; +} + ALSADevice::ALSADevice(PreferencesDialog *dialog, int x, diff --git a/cinelerra/adeviceprefs.h b/cinelerra/adeviceprefs.h index c31fc7c5..797067f9 100644 --- a/cinelerra/adeviceprefs.h +++ b/cinelerra/adeviceprefs.h @@ -20,6 +20,7 @@ class ALSADevice; class ADriverMenu; class ADeviceTextBox; class ADeviceIntBox; +class ADeviceCheckBox; class ADevicePrefs { @@ -72,6 +73,7 @@ private: ADeviceIntBox *firewire_channels; ADeviceTextBox *firewire_path; ADeviceIntBox *firewire_syt; + BC_CheckBox *firewire_use_dv1394; ALSADevice *alsa_device; BitsPopup *alsa_bits; ADeviceIntBox *alsa_channels; @@ -133,6 +135,15 @@ public: int *output; }; +class ADeviceCheckBox : public BC_CheckBox +{ +public: + ADeviceCheckBox(int x, int y, int *output, char *text); + + int handle_event(); + int *output; +}; + class ALSADevice : public BC_PopupTextBox { public: diff --git a/cinelerra/audio1394.C b/cinelerra/audio1394.C index 5c10546a..5e291b21 100644 --- a/cinelerra/audio1394.C +++ b/cinelerra/audio1394.C @@ -80,7 +80,8 @@ int Audio1394::open_output() device->out_channels, device->out_bits, device->out_samplerate, - device->out_config->firewire_syt); + device->out_config->firewire_syt, + device->out_config->firewire_use_dv1394); } } diff --git a/cinelerra/device1394output.C b/cinelerra/device1394output.C index 84beec48..b4567812 100644 --- a/cinelerra/device1394output.C +++ b/cinelerra/device1394output.C @@ -90,20 +90,43 @@ Device1394Output::~Device1394Output() { output_queue.buffer = (output_mmap.nb_buffers + output_queue.buffer - 1) % output_mmap.nb_buffers; - if(ioctl(output_fd, VIDEO1394_TALK_WAIT_BUFFER, &output_queue) < 0) + if(use_dv1394 == 1) { + if(ioctl(output_fd, DV1394_WAIT_FRAMES, output_mmap.nb_buffers - 1) < 0) + { + fprintf(stderr, + "Device1394::close_all: DV1394_WAIT_FRAMES %i: %s", + output_mmap.nb_buffers, + strerror(errno)); + } + munmap(output_buffer, status.init.n_frames * DV1394_NTSC_FRAME_SIZE); + } + else + { + if(ioctl(output_fd, VIDEO1394_TALK_WAIT_BUFFER, &output_queue) < 0) + { fprintf(stderr, "Device1394::close_all: VIDEO1394_TALK_WAIT_BUFFER %s: %s", output_queue, strerror(errno)); - } + } munmap(output_buffer, output_mmap.nb_buffers * output_mmap.buf_size); + } - if(ioctl(output_fd, VIDEO1394_UNTALK_CHANNEL, &output_mmap.channel) < 0) + if(use_dv1394 == 1) { + if(ioctl(output_fd, DV1394_SHUTDOWN, NULL) < 0) + { + perror("Device1394::close_all: DV1394_SHUTDOWN"); + } + } + else + { + if(ioctl(output_fd, VIDEO1394_UNTALK_CHANNEL, &output_mmap.channel) < 0) + { perror("Device1394::close_all: VIDEO1394_UNTALK_CHANNEL"); - } - + } + } close(output_fd); // if(avc_handle) @@ -126,13 +149,35 @@ int Device1394Output::open(char *path, int channels, int bits, int samplerate, - int syt) + int syt, + int use_dv1394) { + int is_pal; + struct stat buf; this->channels = channels; this->bits = bits; this->samplerate = samplerate; this->total_buffers = length; this->syt = syt; + this->use_dv1394 = use_dv1394; + + stat(path, &buf); + + if(strstr(path, "PAL") != NULL || minor(buf.st_rdev) == 34) + is_pal = 1; + else + is_pal = 0; + + static struct dv1394_init setup = { + api_version: DV1394_API_VERSION, + channel: channel, + n_frames: length, + format: is_pal ? DV1394_PAL : DV1394_NTSC, + cip_n: 0, + cip_d: 0, + syt_offset: syt + }; + //printf("Device1394::open_output 2 %s %d %d %d %d\n", path, port, channel, length, syt); if(output_fd < 0) @@ -188,8 +233,6 @@ int Device1394Output::open(char *path, // avc1394_vcr_record(avc_handle, avc_id); - - output_mmap.channel = channel; output_queue.channel = channel; output_mmap.sync_tag = 0; @@ -205,17 +248,44 @@ int Device1394Output::open(char *path, // printf("Device1394Output::open %d %d %d %d %d %d %d\n", // output_mmap.channel, output_queue.channel, output_mmap.sync_tag, output_mmap.nb_buffers, output_mmap.buf_size, output_mmap.packet_size, output_mmap.syt_offset, output_mmap.flags); - if(ioctl(output_fd, VIDEO1394_TALK_CHANNEL, &output_mmap) < 0) + if(use_dv1394 == 1) { - perror("Device1394Output::open VIDEO1394_TALK_CHANNEL:"); - } + if(ioctl(output_fd, DV1394_INIT, &setup) < 0) + { + perror("Device1394Output::open DV1394_INIT:"); + } + if(ioctl(output_fd, DV1394_GET_STATUS, &setup) < 0) + { + perror("Device1394Output::open DV1394_GET_STATUS:"); + } + } + else + { + if(ioctl(output_fd, VIDEO1394_TALK_CHANNEL, &output_mmap) < 0) + { + perror("Device1394Output::open VIDEO1394_TALK_CHANNEL:"); + } + } + if(use_dv1394 == 1) + { + int out_size; + output_buffer = (unsigned char*)mmap(0, + output_mmap.nb_buffers * (is_pal ? DV1394_PAL_FRAME_SIZE : DV1394_NTSC_FRAME_SIZE), + PROT_READ | PROT_WRITE, + MAP_SHARED, + output_fd, + 0); + } + else + { output_buffer = (unsigned char*)mmap(0, output_mmap.nb_buffers * output_mmap.buf_size, PROT_READ | PROT_WRITE, MAP_SHARED, output_fd, 0); + } if(output_buffer <= 0) { perror("Device1394Output::open mmap"); @@ -251,6 +321,10 @@ int Device1394Output::open(char *path, void Device1394Output::run() { + unsigned char *output; + char *out_buffer; + int out_size; + Thread::enable_cancel(); start_lock->lock(); Thread::disable_cancel(); @@ -267,10 +341,17 @@ void Device1394Output::run() buffer_lock->lock(); //printf("Device1394Output::run 10\n"); - char *out_buffer = buffer[current_outbuffer]; - int out_size = buffer_size[current_outbuffer]; - - + if(use_dv1394 == 1) + { + out_buffer = buffer[status.first_clear_frame]; + out_size = buffer_size[status.first_clear_frame]; + } + else + { + out_buffer = buffer[current_outbuffer]; + out_size = buffer_size[current_outbuffer]; + } + @@ -281,11 +362,21 @@ void Device1394Output::run() out_size = sizeof(fake_ntsc_dv) - 4; out_buffer = (char*)fake_ntsc_dv + 4; } - unsigned char *output = output_buffer + + + if(use_dv1394 == 1) + { + output = output_buffer + + out_size * + status.first_clear_frame; + } + else + { + output = output_buffer + output_queue.buffer * output_mmap.buf_size; - int is_pal = (out_size == DV_PAL_SIZE); + } + int is_pal = (out_size == DV_PAL_SIZE); @@ -321,14 +412,19 @@ void Device1394Output::run() audio_lock->unlock(); } - // Copy from current buffer to mmap buffer with firewire encryption - encrypt((unsigned char*)output, - (unsigned char*)out_buffer, - out_size); + if(use_dv1394 == 1) + { + memcpy(output, out_buffer, out_size); + } + else + { + encrypt((unsigned char*)output, + (unsigned char*)out_buffer, + out_size); + } buffer_valid[current_outbuffer] = 0; } - // Advance buffer number if possible increment_counter(¤t_outbuffer); @@ -343,33 +439,52 @@ void Device1394Output::run() video_lock->unlock(); } - buffer_lock->unlock(); //printf("Device1394Output::run 100\n"); - - if(out_size > 0) { - // Write mmap to device Thread::enable_cancel(); unused_buffers--; - if(ioctl(output_fd, VIDEO1394_TALK_QUEUE_BUFFER, &output_queue) < 0) + if(use_dv1394 == 1) { - perror("Device1394Output::run VIDEO1394_TALK_QUEUE_BUFFER"); - } - + if(ioctl(output_fd, DV1394_SUBMIT_FRAMES, 1) < 0) + { + perror("Device1394Output::run DV1394_SUBMIT_FRAMES:"); + } + if(ioctl(output_fd, DV1394_GET_STATUS, &status) < 0) + { + perror("Device1394Output::run DV1394_GET_STATUS:"); + } + } + else + { + if(ioctl(output_fd, VIDEO1394_TALK_QUEUE_BUFFER, &output_queue) < 0) + { + perror("Device1394Output::run VIDEO1394_TALK_QUEUE_BUFFER"); + } + } output_queue.buffer++; if(output_queue.buffer >= output_mmap.nb_buffers) output_queue.buffer = 0; if(unused_buffers <= 0) { - if(ioctl(output_fd, VIDEO1394_TALK_WAIT_BUFFER, &output_queue) < 0) + if(use_dv1394 == 1) { - perror("Device1394::run VIDEO1394_TALK_WAIT_BUFFER"); - } + if(ioctl(output_fd, DV1394_WAIT_FRAMES, 1) < 0) + { + perror("Device1394Output::run DV1394_WAIT_FRAMES"); + } + } + else + { + if(ioctl(output_fd, VIDEO1394_TALK_WAIT_BUFFER, &output_queue) < 0) + { + perror("Device1394::run VIDEO1394_TALK_WAIT_BUFFER"); + } + } unused_buffers++; } Thread::disable_cancel(); diff --git a/cinelerra/device1394output.h b/cinelerra/device1394output.h index 9a6b7fe3..38f83fe2 100644 --- a/cinelerra/device1394output.h +++ b/cinelerra/device1394output.h @@ -11,6 +11,7 @@ #include "thread.h" #include "vframe.inc" #include "video1394.h" +#include // Common 1394 output for audio and video @@ -29,7 +30,8 @@ public: int channels, int bits, int samplerate, - int syt); + int syt, + int use_dv1394); void start(); void run(); @@ -83,6 +85,7 @@ public: // Output int output_fd; + struct dv1394_status status; struct video1394_mmap output_mmap; struct video1394_queue_variable output_queue; // raw1394handle_t avc_handle; @@ -107,6 +110,7 @@ public: long audio_position; int interrupted; int have_video; + int use_dv1394; }; diff --git a/cinelerra/playbackconfig.C b/cinelerra/playbackconfig.C index 32e389d8..be65b57b 100644 --- a/cinelerra/playbackconfig.C +++ b/cinelerra/playbackconfig.C @@ -30,6 +30,7 @@ AudioOutConfig::AudioOutConfig(int playback_strategy, int engine_number, int dup firewire_port = 0; strcpy(firewire_path, "/dev/video1394"); firewire_syt = 30000; + firewire_use_dv1394 = 0; bzero(do_channel, sizeof(int) * MAX_CHANNELS); } @@ -61,7 +62,8 @@ int AudioOutConfig::operator==(AudioOutConfig &that) firewire_channel == that.firewire_channel && firewire_port == that.firewire_port && firewire_syt == that.firewire_syt && - !strcmp(firewire_path, that.firewire_path); + !strcmp(firewire_path, that.firewire_path) && + firewire_use_dv1394 == that.firewire_use_dv1394; } @@ -88,6 +90,7 @@ AudioOutConfig& AudioOutConfig::operator=(AudioOutConfig &that) firewire_port = that.firewire_port; firewire_syt = that.firewire_syt; strcpy(firewire_path, that.firewire_path); + firewire_use_dv1394 = that.firewire_use_dv1394; for(int i = 0; i < MAXCHANNELS; i++) do_channel[i] = that.do_channel[i]; @@ -142,6 +145,8 @@ int AudioOutConfig::load_defaults(Defaults *defaults) defaults->get(string, firewire_path); sprintf(string, "AFIREWIRE_OUT_SYT_%d_%d", playback_strategy, engine_number); firewire_syt = defaults->get(string, firewire_syt); + sprintf(string, "AFIREWIRE_OUT_USE_DV1394_%d_%d", playback_strategy, engine_number); + firewire_use_dv1394 = defaults->get(string, firewire_use_dv1394); return 0; } @@ -191,7 +196,8 @@ int AudioOutConfig::save_defaults(Defaults *defaults) defaults->update(string, firewire_path); sprintf(string, "AFIREWIRE_OUT_SYT_%d_%d", playback_strategy, engine_number); defaults->update(string, firewire_syt); - + sprintf(string, "AFIREWIRE_OUT_USE_DV1394_%d_%d", playback_strategy, engine_number); + defaults->update(string, firewire_use_dv1394); return 0; } @@ -272,6 +278,7 @@ VideoOutConfig::VideoOutConfig(int playback_strategy, int engine_number) firewire_port = 0; strcpy(firewire_path, "/dev/video1394"); firewire_syt = 30000; + firewire_use_dv1394 = 0; } VideoOutConfig::~VideoOutConfig() @@ -301,7 +308,8 @@ int VideoOutConfig::operator==(VideoOutConfig &that) (firewire_channel == that.firewire_channel) && (firewire_port == that.firewire_port) && !strcmp(firewire_path, that.firewire_path) && - (firewire_syt == that.firewire_syt); + (firewire_syt == that.firewire_syt) && + (firewire_use_dv1394 == that.firewire_use_dv1394); } @@ -324,6 +332,7 @@ VideoOutConfig& VideoOutConfig::operator=(VideoOutConfig &that) firewire_port = that.firewire_port; strcpy(firewire_path, that.firewire_path); firewire_syt = that.firewire_syt; + firewire_use_dv1394 = that.firewire_use_dv1394; return *this; } @@ -369,6 +378,8 @@ int VideoOutConfig::load_defaults(Defaults *defaults) defaults->get(string, firewire_path); sprintf(string, "VFIREWIRE_OUT_SYT_%d_%d", playback_strategy, engine_number); firewire_syt = defaults->get(string, firewire_syt); + sprintf(string, "VFIREWIRE_OUT_USE_DV1394_%d_%d", playback_strategy, engine_number); + firewire_use_dv1394 = defaults->get(string, firewire_use_dv1394); return 0; } @@ -396,6 +407,8 @@ int VideoOutConfig::save_defaults(Defaults *defaults) defaults->update(string, firewire_path); sprintf(string, "VFIREWIRE_OUT_SYT_%d_%d", playback_strategy, engine_number); defaults->update(string, firewire_syt); + sprintf(string, "VFIREWIRE_OUT_USE_DV1394_%d_%d", playback_strategy, engine_number); + defaults->update(string, firewire_use_dv1394); return 0; } diff --git a/cinelerra/playbackconfig.h b/cinelerra/playbackconfig.h index 75525672..8f7206ea 100644 --- a/cinelerra/playbackconfig.h +++ b/cinelerra/playbackconfig.h @@ -48,6 +48,7 @@ public: int firewire_frames; char firewire_path[BCTEXTLEN]; int firewire_syt; + int firewire_use_dv1394; }; // This structure is passed to the driver @@ -101,6 +102,7 @@ public: int firewire_port; char firewire_path[BCTEXTLEN]; int firewire_syt; + int firewire_use_dv1394; }; class PlaybackConfig diff --git a/cinelerra/preferences.C b/cinelerra/preferences.C index 02c21c05..ca0fb785 100644 --- a/cinelerra/preferences.C +++ b/cinelerra/preferences.C @@ -171,7 +171,7 @@ int Preferences::load_defaults(Defaults *defaults) index_count = defaults->get("INDEX_COUNT", index_count); use_thumbnails = defaults->get("USE_THUMBNAILS", use_thumbnails); - sprintf(global_plugin_dir, "/usr/lib/cinelerra"); + sprintf(global_plugin_dir, PLUGINDIR); sprintf(local_plugin_dir, ""); strcpy(theme, DEFAULT_THEME); defaults->get("GLOBAL_PLUGIN_DIR", global_plugin_dir); diff --git a/cinelerra/renderfarmfsclient.C b/cinelerra/renderfarmfsclient.C index 59359583..e0fc4f6e 100644 --- a/cinelerra/renderfarmfsclient.C +++ b/cinelerra/renderfarmfsclient.C @@ -379,7 +379,6 @@ __off64_t ftello64 (FILE *__stream) return (*func)(__stream); } - // Glibc inlines the stat functions and redirects them to __xstat functions int __xstat (int __ver, __const char *__filename, struct stat *__stat_buf) @@ -391,7 +390,7 @@ int __xstat (int __ver, __const char *__filename, if (!func) func = (int(*)(int __ver, __const char *__filename, - struct stat *__stat_buf))dlsym(RTLD_NEXT, "stat"); + struct stat *__stat_buf))dlsym(RTLD_NEXT, "__xstat"); // VFS path if(!strncmp(__filename, RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX))) diff --git a/cinelerra/vdevice1394.C b/cinelerra/vdevice1394.C index b343b7b0..0461d870 100644 --- a/cinelerra/vdevice1394.C +++ b/cinelerra/vdevice1394.C @@ -94,7 +94,8 @@ int VDevice1394::open_output() 2, 16, 48000, - device->out_config->firewire_syt); + device->out_config->firewire_syt, + device->out_config->firewire_use_dv1394); } return 0; diff --git a/cinelerra/vdeviceprefs.C b/cinelerra/vdeviceprefs.C index 5d393863..df520eda 100644 --- a/cinelerra/vdeviceprefs.C +++ b/cinelerra/vdeviceprefs.C @@ -141,6 +141,8 @@ int VDevicePrefs::delete_objects() delete firewire_syt; delete syt_title; } + delete firewire_use_dv1394; + firewire_use_dv1394 = 0; firewire_syt = 0; break; } @@ -279,6 +281,24 @@ int VDevicePrefs::create_firewire_objs() dialog->add_subwindow(syt_title = new BC_Title(x1, y, _("Syt Offset:"), MEDIUMFONT, BLACK)); dialog->add_subwindow(firewire_syt = new VDeviceIntBox(x1, y + 20, output_int)); } + x1 = x + menu->get_w() + 5; + + switch(mode) + { + case MODEPLAY: + output_int = &out_config->firewire_use_dv1394; + break; + case MODERECORD: + //output_int = &in_config->firewire_use_dv1394; + output_int = 0; + break; + } + + if(output_int) + { + dialog->add_subwindow(firewire_use_dv1394 = + new VDeviceCheckBox(x1, y + 45, output_int, _("Use DV1394"))); + } return 0; } diff --git a/cinelerra/vdeviceprefs.h b/cinelerra/vdeviceprefs.h index 207f2312..26247c5d 100644 --- a/cinelerra/vdeviceprefs.h +++ b/cinelerra/vdeviceprefs.h @@ -58,6 +58,7 @@ private: VDeviceIntBox *firewire_channels; VDeviceIntBox *firewire_syt; VDeviceTextBox *firewire_path; + VDeviceCheckBox *firewire_use_dv1394; VDeviceCheckBox *buz_swap_channels; int driver, mode; int x; diff --git a/config.h.in b/config.h.in index 89850dd8..17a750f2 100644 --- a/config.h.in +++ b/config.h.in @@ -11,6 +11,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the header file. */ +#undef HAVE_FFMPEG_AVCODEC_H + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -26,21 +29,27 @@ /* Define to 1 if you have the `asound' library (-lasound). */ #undef HAVE_LIBASOUND -/* Define to 1 if you have the `sndfile' library (-lsndfile). */ -#undef HAVE_LIBSNDFILE +/* Define to 1 if you have the `avc1394' library (-lavc1394). */ +#undef HAVE_LIBAVC1394 + +/* Define to 1 if you have the `raw1394' library (-lraw1394). */ +#undef HAVE_LIBRAW1394 + +/* Define to 1 if you have the `rom1394' library (-lrom1394). */ +#undef HAVE_LIBROM1394 /* Define to 1 if you have the `uuid' library (-luuid). */ #undef HAVE_LIBUUID +/* Define to 1 if you have the `X11' library (-lX11). */ +#undef HAVE_LIBX11 + /* Define to 1 if you have the `xvidcore' library (-lxvidcore). */ #undef HAVE_LIBXVIDCORE /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SNDFILE_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -65,6 +74,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UUID_UUID_H +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XLIB_H + /* Define to 1 if you have the header file. */ #undef HAVE_XVID_H diff --git a/configure.in b/configure.in index 64ce3404..2c04201e 100644 --- a/configure.in +++ b/configure.in @@ -113,7 +113,7 @@ fi ############## LIBAVCODEC AC_CHECK_HEADERS(ffmpeg/avcodec.h) -AC_CHECK_LIB(avcodec, avcodec_init, ,[AC_MSG_NOTICE([libavcodec not found]) +AC_CHECK_LIB(avcodec, avcodec_init,[AC_MSG_NOTICE([libavcodec found])] ,[AC_MSG_NOTICE([libavcodec not found]) NOT_FOUND="$NOT_FOUND libavcodec"]) # END LIBAVCODEC @@ -277,12 +277,8 @@ AC_OUTPUT(Makefile po/Makefile.in \ plugins/Makefile plugins/1080to480/Makefile \ plugins/histogram/Makefile \ plugins/720to480/Makefile \ - plugins/blurzoom/Makefile \ plugins/denoisemjpeg/Makefile \ - plugins/graphic/Makefile \ - plugins/interpolate/Makefile \ plugins/motion/Makefile \ - plugins/quark/Makefile \ plugins/bandslide/Makefile \ plugins/libcolors/Makefile \ plugins/libfourier/Makefile \ diff --git a/guicast/Makefile.am b/guicast/Makefile.am index 4a4bb92f..f8f6c14e 100644 --- a/guicast/Makefile.am +++ b/guicast/Makefile.am @@ -10,16 +10,22 @@ libguicast_la_SOURCES = bcbitmap.C bcbutton.C bccapture.C bcclipboard.C bcdispla vframe.C workarounds.C bclistboxitem.C bctheme.C condition.C noinst_HEADERS = arraylist.h bcbitmap.h bcbitmap.inc bcbutton.h bcbutton.inc bccapture.h bccapture.inc bcclipboard.h \ bcclipboard.inc bcdisplayinfo.h bcdisplayinfo.inc bcdragwindow.h bcdragwindow.inc bcfilebox.h \ - bcfilebox.inc bcipc.h bclistbox.h bclistbox.inc bcmenubar.h bcmenubar.inc bcmeter.h bcmeter.inc \ - bcpan.h bcpan.inc bcpixmap.h bcpixmap.inc bcpopup.h bcpopup.inc bcpopuplistbox.h bcpopuplistbox.inc \ - bcpopupmenu.h bcpopupmenu.inc bcpot.h bcpot.inc bcprogressbox.h bcprogressbox.inc bcprogress.h \ + bcfilebox.inc bcipc.h bclistbox.h bclistbox.inc bclistboxitem.inc bcmenubar.h bcmenubar.inc bcmeter.h bcmeter.inc \ + bcpan.h bcpan.inc bcpixmap.h bcpixmap.inc bcpopup.h bcpopup.inc \ + bcpopupmenu.h bcpopupmenu.inc bcpopuplistbox.inc bcpot.h bcpot.inc bcprogressbox.h bcprogressbox.inc bcprogress.h \ bcprogress.inc bcrepeater.h bcrepeater.inc bcresources.h bcresources.inc bcscrollbar.h bcscrollbar.inc \ bcsignals.h bcsignals.inc bcslider.h bcslider.inc bcsubwindow.h bcsubwindow.inc bctextbox.h bctextbox.inc \ - bctitle.h bctitle.inc bctoggle.h bctoggle.inc bctumble.h bctumble.inc bcwindowbase.h bcwindowbase.inc \ - bcwindow.h bcwindow.inc clip.h colors.h cursors.h defaults.h defaults.inc errorbox.h errorbox.inc \ + bctheme.inc bctitle.h bctitle.inc bctoggle.h bctoggle.inc bctumble.h bctumble.inc bcwindowbase.h bcwindowbase.inc \ + bcwindow.h bcwindow.inc clip.h colors.h condition.inc cursors.h defaults.h defaults.inc errorbox.h errorbox.inc \ filesystem.h filesystem.inc fonts.h guicast.h keys.h linklist.h mutex.h mutex.inc rotateframe.h \ rotateframe.inc sema.h sema.inc sizes.h stringfile.h stringfile.inc testobject.h thread.h timer.h \ timer.inc units.h vframe.h vframe.inc workarounds.h bclistboxitem.h bctheme.h condition.h INCLUDES = -I$(top_srcdir)/quicktime -I/usr/include/qt LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +EXTRA_DIST = images pngtoh.c + +dist-hook: + -rm -rf $(distdir)/images/CVS + -rm -rf $(distdir)/images/7seg_small/CVS diff --git a/libmpeg3/Makefile.am b/libmpeg3/Makefile.am index 9fdad1bf..cfa9594b 100644 --- a/libmpeg3/Makefile.am +++ b/libmpeg3/Makefile.am @@ -1,4 +1,3 @@ -INCLUDES = -Ivideo -Iaudio lib_LTLIBRARIES = libmpeg3.la AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) $(CSS_CFLAGS) libmpeg3_la_LDFLAGS = -version-info 1:0:0 -release 1.5.0 -Wl,--no-undefined @@ -9,6 +8,22 @@ libmpeg3_la_SOURCES = bitstream.c libmpeg3.c mpeg3atrack.c mpeg3css.c \ mpeg3vtrack.c workarounds.c SUBDIRS = audio video +noinst_HEADERS = bitstream.h \ + ifo.h \ + libmpeg3.h \ + mpeg3atrack.h \ + mpeg3css.h \ + mpeg3demux.h \ + mpeg3io.h \ + mpeg3private.h \ + mpeg3private.inc \ + mpeg3protos.h \ + mpeg3title.h \ + mpeg3vtrack.h \ + timecode.h \ + workarounds.h + + pkgincludedir=$(includedir)/mpeg3 pkginclude_HEADERS=libmpeg3.h mpeg3private.h LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/libmpeg3/audio/Makefile.am b/libmpeg3/audio/Makefile.am index e9a7d110..3016b98b 100644 --- a/libmpeg3/audio/Makefile.am +++ b/libmpeg3/audio/Makefile.am @@ -1,9 +1,12 @@ noinst_LTLIBRARIES = libmpeg3_audio.la libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c synthesizers.c tables.c libmpeg3_audio_la_LDFLAGS = -static + +noinst_HEADERS = ac3.h huffman.h mpeg3audio.h tables.h + AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) -INCLUDES=-I.. -I/usr/include/a52dec +INCLUDES=-I$(srcdir)/.. -I/usr/include/a52dec LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/libmpeg3/video/Makefile.am b/libmpeg3/video/Makefile.am index 65d6a6ea..2ea5bdc0 100644 --- a/libmpeg3/video/Makefile.am +++ b/libmpeg3/video/Makefile.am @@ -7,8 +7,15 @@ else libmpeg3_video_la_SOURCES += endif +noinst_HEADERS = idct.h \ + layerdata.h \ + mpeg3video.h \ + mpeg3videoprotos.h \ + slice.h \ + vlc.h + libmpeg3_video_la_LDFLAGS=-static AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) -INCLUDES=-I.. +INCLUDES=-I$(srcdir)/.. LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/mpeg2enc/Makefile.am b/mpeg2enc/Makefile.am index 0fb8c94f..ce4dfbf2 100644 --- a/mpeg2enc/Makefile.am +++ b/mpeg2enc/Makefile.am @@ -4,9 +4,9 @@ noinst_LTLIBRARIES = libmpeg2enc.la -libmpeg2enc_la_CFLAGS =-I../quicktime -I../libmpeg3 +libmpeg2enc_la_CFLAGS =-I$(top_srcdir)/quicktime -I$(top_srcdir)/libmpeg3 -libmpeg2enc_la_SOURCES = mpeg2enc.c conform.c putseq.c putpic.c puthdr.c putmpg.c \ +libmpeg2enc_la_SOURCES = conform.c mpeg2enc.c putseq.c putpic.c puthdr.c putmpg.c \ putvlc.c putbits.c predict.c readpic.c writepic.c transfrm.c \ fdctref.c idct.c quantize.c ratectl.c stats.c \ global.h mpeg2enc.h vlc.h \ @@ -18,5 +18,17 @@ libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \ predcomp_mmxe.s predcomp_mmx.s endif +noinst_HEADERS = attributes.h \ + config.h \ + cpu_accel.h \ + fastintfns.h \ + global.h \ + mmx.h \ + mpeg2enc.h \ + mtable.h \ + putbits.h \ + simd.h \ + vlc.h + libmpeg2enc_la_LIBADD=@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS) LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/mplexhi/Makefile.am b/mplexhi/Makefile.am index 7c3ba53f..01ded473 100644 --- a/mplexhi/Makefile.am +++ b/mplexhi/Makefile.am @@ -4,4 +4,4 @@ bin_PROGRAMS = mplexhi AM_CFLAGS = -Wall AM_LDFLAGS= -lm -mplexhi_SOURCES = main.c bits.c buffer.c inits.c inptstrm.c interact.c multplex.c systems.c vector.c bits.h main.h vector.h +mplexhi_SOURCES = main.c bits.c buffer.c inits.c inptstrm.c interact.c multplex.c systems.c vector.c bits.h config.h main.h vector.h diff --git a/mplexlo/Makefile.am b/mplexlo/Makefile.am index d4353aaf..50353900 100644 --- a/mplexlo/Makefile.am +++ b/mplexlo/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS=mplexlo -INCLUDES=-I../libmpeg3 +INCLUDES=-I$(top_srcdir)/libmpeg3 mplexlo_LDADD=../libmpeg3/libmpeg3.la mplexlo_LDFLAGS=-lm -lpthread diff --git a/plugins/1080to480/Makefile.am b/plugins/1080to480/Makefile.am index 484efb2c..ccfb5e13 100644 --- a/plugins/1080to480/Makefile.am +++ b/plugins/1080to480/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = 1080to480.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/720to480/Makefile.am b/plugins/720to480/Makefile.am index b9b9bd0d..8cccdeae 100644 --- a/plugins/720to480/Makefile.am +++ b/plugins/720to480/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = 720to480.h diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 83275b80..d7bcb032 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -7,14 +7,30 @@ SUBDIRS=1080to480 720to480 denoisemjpeg motion libfourier libeffecttv \ reversevideo rgb601 rotate scale sharpen shiftinterlace slide spectrogram swapchannels \ synthesizer timeavg timestretch titler translate videoscope wave whirl wipe yuv microtheme \ defaulttheme downsample flash gradient level linearblur \ - perspective radialblur zoomblur fonts \ - svg histogram + perspective radialblur zoomblur \ + svg histogram fonts AUTOMAKE_OPTIONS=foreign noinst_PROGRAMS=bootstrap bootstrap_SOURCES=bootstrap.c +EXTRA_DIST = install_plugins themes + install-exec-hook: - ./install_plugins $(DESTDIR)$(plugindir) + @echo "Postprocessing plugins in $(DESTDIR)$(plugindir)" + for theme in `cat $(srcdir)/themes`; do \ + echo $(DESTDIR)$(plugindir)/$$theme.so; \ + ./bootstrap $(DESTDIR)$(plugindir)/$$theme.so $(srcdir)/$$theme/data/*.png; \ + done + cd $(DESTDIR)$(plugindir); \ + rm -f *.a *.la; \ + for file in *.so; do \ + newfile=$${file/.so/.plugin}; \ + mv -f $$file $$newfile; \ + done; \ + mv libcolors.plugin libcolors.so; \ + mv libfourier.plugin libfourier.so; \ + mv libeffecttv.plugin libeffecttv.so + diff --git a/plugins/aging/Makefile.am b/plugins/aging/Makefile.am index e3222059..bd07d162 100644 --- a/plugins/aging/Makefile.am +++ b/plugins/aging/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = aging.la aging_la_LDFLAGS = -avoid-version -module -shared -aging_la_LIBADD = $(top_srcdir)/plugins/libeffecttv/libeffecttv.la +aging_la_LIBADD = $(top_builddir)/plugins/libeffecttv/libeffecttv.la aging_la_SOURCES = aging.C agingwindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = aging.h agingwindow.h effecttv.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/bandslide/Makefile.am b/plugins/bandslide/Makefile.am index c1243341..c9f47b23 100644 --- a/plugins/bandslide/Makefile.am +++ b/plugins/bandslide/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = bandslide.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/bandwipe/Makefile.am b/plugins/bandwipe/Makefile.am index 12189fec..96e5d777 100644 --- a/plugins/bandwipe/Makefile.am +++ b/plugins/bandwipe/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = bandwipe.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/blur/Makefile.am b/plugins/blur/Makefile.am index 2f77d5ee..243663e0 100644 --- a/plugins/blur/Makefile.am +++ b/plugins/blur/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = blur.h blur.inc blurwindow.h blurwindow.inc picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/blurzoom/Makefile.am b/plugins/blurzoom/Makefile.am index 19738ffe..5d109555 100644 --- a/plugins/blurzoom/Makefile.am +++ b/plugins/blurzoom/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = blurzoom.h blurzoomwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/brightness/Makefile.am b/plugins/brightness/Makefile.am index 6824771b..af02fe65 100644 --- a/plugins/brightness/Makefile.am +++ b/plugins/brightness/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = brightness.la brightness_la_LDFLAGS = -avoid-version -module -shared -brightness_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +brightness_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la brightness_la_SOURCES = brightness.C brightnesswindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = brightness.h brightnesswindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/burn/Makefile.am b/plugins/burn/Makefile.am index 8927eb7b..1100e7b4 100644 --- a/plugins/burn/Makefile.am +++ b/plugins/burn/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = burn.la burn_la_LDFLAGS = -avoid-version -module -shared -burn_la_LIBADD = $(top_srcdir)/plugins/libeffecttv/libeffecttv.la +burn_la_LIBADD = $(top_builddir)/plugins/libeffecttv/libeffecttv.la burn_la_SOURCES = burn.C burnwindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = burn.h burnwindow.h effecttv.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/cdripper/Makefile.am b/plugins/cdripper/Makefile.am index a1b63cc4..8c13ada2 100644 --- a/plugins/cdripper/Makefile.am +++ b/plugins/cdripper/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = cdripper.h cdripwindow.h diff --git a/plugins/chromakey/Makefile.am b/plugins/chromakey/Makefile.am index bbb14044..6f6cd24b 100644 --- a/plugins/chromakey/Makefile.am +++ b/plugins/chromakey/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = chromakey.la chromakey_la_LDFLAGS = -avoid-version -module -shared -chromakey_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +chromakey_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la chromakey_la_SOURCES = chromakey.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = chromakey.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/colorbalance/Makefile.am b/plugins/colorbalance/Makefile.am index d6e3f901..0e9e7923 100644 --- a/plugins/colorbalance/Makefile.am +++ b/plugins/colorbalance/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = colorbalance.la colorbalance_la_LDFLAGS = -avoid-version -module -shared -colorbalance_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +colorbalance_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la colorbalance_la_SOURCES = colorbalance.C colorbalancewindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = colorbalance.h colorbalancewindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/colors/Makefile.am b/plugins/colors/Makefile.am index 82140108..0b09a908 100644 --- a/plugins/colors/Makefile.am +++ b/plugins/colors/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = colorpicker.h plugincolors.h diff --git a/plugins/compressor/Makefile.am b/plugins/compressor/Makefile.am index 34f49eb3..fc68ba94 100644 --- a/plugins/compressor/Makefile.am +++ b/plugins/compressor/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = compressor.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/crossfade/Makefile.am b/plugins/crossfade/Makefile.am index 0161a1fe..3d503808 100644 --- a/plugins/crossfade/Makefile.am +++ b/plugins/crossfade/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = crossfade.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/defaulttheme/Makefile.am b/plugins/defaulttheme/Makefile.am index f70b7256..2436b00e 100644 --- a/plugins/defaulttheme/Makefile.am +++ b/plugins/defaulttheme/Makefile.am @@ -7,3 +7,27 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = defaulttheme.h + +EXTRA_DIST = data + buttons.xcf.bz2 \ + cwindow.xcf.bz2 \ + cwindow2.xcf.bz2 \ + hscroll.xcf.bz2 \ + hscroll2.xcf.bz2 \ + mwindow.xcf.bz2 \ + mwindow2.xcf.bz2 \ + recordgui.xcf.bz2 \ + recordmonitor.xcf.bz2 \ + scrollbar.xcf.bz2 \ + slider_bg.xcf.bz2 \ + slider_button.xcf.bz2 \ + statusbar_cancel.xcf.bz2 \ + tumbler.xcf.bz2 \ + vscrollbar.xcf.bz2 \ + vwindow.xcf.bz2 + +dist-hook: + -rm -rf $(distdir)/data/CVS + diff --git a/plugins/deinterlace/Makefile.am b/plugins/deinterlace/Makefile.am index 89309ef2..d0900bbc 100644 --- a/plugins/deinterlace/Makefile.am +++ b/plugins/deinterlace/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = deinterlace.h deinterwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/delayaudio/Makefile.am b/plugins/delayaudio/Makefile.am index 9b7f2a18..b18cf775 100644 --- a/plugins/delayaudio/Makefile.am +++ b/plugins/delayaudio/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = delayaudio.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/delayvideo/Makefile.am b/plugins/delayvideo/Makefile.am index c0b3c225..50fc7d75 100644 --- a/plugins/delayvideo/Makefile.am +++ b/plugins/delayvideo/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = delayvideo.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/denoise/Makefile.am b/plugins/denoise/Makefile.am index 0300bd25..89c57419 100644 --- a/plugins/denoise/Makefile.am +++ b/plugins/denoise/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = denoise.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/denoisefft/Makefile.am b/plugins/denoisefft/Makefile.am index 595fe18e..c1a56caa 100644 --- a/plugins/denoisefft/Makefile.am +++ b/plugins/denoisefft/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = denoisefft.la denoisefft_la_LDFLAGS = -avoid-version -module -shared -denoisefft_la_LIBADD = $(top_srcdir)/plugins/libfourier/libfourier.la +denoisefft_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la denoisefft_la_SOURCES = denoisefft.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libfourier LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/denoisemjpeg/Makefile.am b/plugins/denoisemjpeg/Makefile.am index a07826c1..b1a43f5b 100644 --- a/plugins/denoisemjpeg/Makefile.am +++ b/plugins/denoisemjpeg/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = denoisemjpeg.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/denoisevideo/Makefile.am b/plugins/denoisevideo/Makefile.am index 272e42e1..c5801054 100644 --- a/plugins/denoisevideo/Makefile.am +++ b/plugins/denoisevideo/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = denoisevideo.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/despike/Makefile.am b/plugins/despike/Makefile.am index a31e1b9e..e0c8ac07 100644 --- a/plugins/despike/Makefile.am +++ b/plugins/despike/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = despike.h despikewindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/dissolve/Makefile.am b/plugins/dissolve/Makefile.am index ddefa1d0..0beb4b72 100644 --- a/plugins/dissolve/Makefile.am +++ b/plugins/dissolve/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = dissolve.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/dot/Makefile.am b/plugins/dot/Makefile.am index 08989067..e633db4c 100644 --- a/plugins/dot/Makefile.am +++ b/plugins/dot/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = dot.la dot_la_LDFLAGS = -avoid-version -module -shared -dot_la_LIBADD = $(top_srcdir)/plugins/libeffecttv/libeffecttv.la +dot_la_LIBADD = $(top_builddir)/plugins/libeffecttv/libeffecttv.la dot_la_SOURCES = dot.C dotwindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = dot.h dotwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/downsample/Makefile.am b/plugins/downsample/Makefile.am index 59866107..376ed733 100644 --- a/plugins/downsample/Makefile.am +++ b/plugins/downsample/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/fieldframe/Makefile.am b/plugins/fieldframe/Makefile.am index 93ae2aab..1cdf9c15 100644 --- a/plugins/fieldframe/Makefile.am +++ b/plugins/fieldframe/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/flash/Makefile.am b/plugins/flash/Makefile.am index 2701880a..4d88a24d 100644 --- a/plugins/flash/Makefile.am +++ b/plugins/flash/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = flash.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/flip/Makefile.am b/plugins/flip/Makefile.am index 0755b1b3..81840818 100644 --- a/plugins/flip/Makefile.am +++ b/plugins/flip/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = flip.h flipwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/fonts/Makefile.am b/plugins/fonts/Makefile.am dissimilarity index 89% index 3f847d88..aabfa52f 100644 --- a/plugins/fonts/Makefile.am +++ b/plugins/fonts/Makefile.am @@ -1,3 +1,4 @@ -fonts_DATA = arialbd.ttf arialbi.ttf ariali.ttf arial.ttf ariblk.ttf comicbd.ttf comic.ttf courbd.ttf courbi.ttf couri.ttf cour.ttf fonts.dir georgiab.ttf georgiai.ttf georgia.ttf georgiaz.ttf impact.ttf l_10646.ttf lucon.ttf micross.ttf old_engl.ttf palabi.ttf palab.ttf palai.ttf pala.ttf symbol.ttf tahomabd.ttf tahoma.ttf timesbd.ttf timesbi.ttf timesi.ttf times.ttf trebucbd.ttf trebucbi.ttf trebucit.ttf trebuc.ttf verdanab.ttf verdanai.ttf verdana.ttf verdanaz.ttf webdings.ttf wingding.ttf - -LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) +fonts_DATA = fonts.dir $(srcdir)/*.ttf +EXTRA_DIST = fonts.dir $(srcdir)/*.ttf + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) diff --git a/plugins/fourier/Makefile.am b/plugins/fourier/Makefile.am index 2c6469d8..3daf5a14 100644 --- a/plugins/fourier/Makefile.am +++ b/plugins/fourier/Makefile.am @@ -3,3 +3,5 @@ libfourier_la_SOURCES=fourier.C libfourier_la_LDFLAGS=-avoid-version -shared INCLUDES = -I$(top_srcdir)/guicast LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = fourier.h diff --git a/plugins/framefield/Makefile.am b/plugins/framefield/Makefile.am index d9b258ca..01b3deb1 100644 --- a/plugins/framefield/Makefile.am +++ b/plugins/framefield/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am index bde6bb23..797f43ca 100644 --- a/plugins/freeverb/Makefile.am +++ b/plugins/freeverb/Makefile.am @@ -6,5 +6,14 @@ freeverb_la_SOURCES = Components/allpass.cpp Components/comb.cpp \ AM_CFLAGS = AM_CXXFLAGS = -INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I./Components +INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(srcdir)/Components LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h \ + Components/allpass.hpp \ + Components/comb.hpp \ + Components/denormals.h \ + Components/revmodel.hpp \ + Components/tuning.h + +EXTRA_DIST = picon.png diff --git a/plugins/freezeframe/Makefile.am b/plugins/freezeframe/Makefile.am index 63908750..c0424b82 100644 --- a/plugins/freezeframe/Makefile.am +++ b/plugins/freezeframe/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = freezeframe.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/gain/Makefile.am b/plugins/gain/Makefile.am index 6b83f13a..05b39860 100644 --- a/plugins/gain/Makefile.am +++ b/plugins/gain/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = gain.h gainwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/gradient/Makefile.am b/plugins/gradient/Makefile.am index c3c0b7fe..49c67069 100644 --- a/plugins/gradient/Makefile.am +++ b/plugins/gradient/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = gradient.la gradient_la_LDFLAGS = -avoid-version -module -shared -gradient_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +gradient_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la gradient_la_SOURCES = gradient.C AM_CFLAGS = AM_CXXFLAGS = -INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I../libcolors +INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = blur.inc gradient.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/histogram/Makefile.am b/plugins/histogram/Makefile.am index c1df3691..e9c9672d 100644 --- a/plugins/histogram/Makefile.am +++ b/plugins/histogram/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = histogram.la histogram_la_LDFLAGS = -avoid-version -module -shared -histogram_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +histogram_la_LIBADD = histogram_la_SOURCES = histogram.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = max_picon_png.h mid_picon_png.h min_picon_png.h picon_png.h +EXTRA_DIST = picon.png max_picon.png mid_picon.png min_picon.png diff --git a/plugins/holo/Makefile.am b/plugins/holo/Makefile.am index e49493e1..b367ab46 100644 --- a/plugins/holo/Makefile.am +++ b/plugins/holo/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = holo.la holo_la_LDFLAGS = -avoid-version -module -shared -holo_la_LIBADD = $(top_srcdir)/plugins/libeffecttv/libeffecttv.la +holo_la_LIBADD = $(top_builddir)/plugins/libeffecttv/libeffecttv.la holo_la_SOURCES = holo.C holowindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = holo.h holowindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/huesaturation/Makefile.am b/plugins/huesaturation/Makefile.am index 64133fc0..7a77616e 100644 --- a/plugins/huesaturation/Makefile.am +++ b/plugins/huesaturation/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = huesaturation.la huesaturation_la_LDFLAGS = -avoid-version -module -shared -huesaturation_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +huesaturation_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la huesaturation_la_SOURCES = huesaturation.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = huesaturation.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/invertaudio/Makefile.am b/plugins/invertaudio/Makefile.am index 3871ddc6..de280d36 100644 --- a/plugins/invertaudio/Makefile.am +++ b/plugins/invertaudio/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/invertvideo/Makefile.am b/plugins/invertvideo/Makefile.am index 1c21d958..5ec9ebf9 100644 --- a/plugins/invertvideo/Makefile.am +++ b/plugins/invertvideo/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = invertvideo.la invertvideo_la_LDFLAGS = -avoid-version -module -shared -invertvideo_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +invertvideo_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la invertvideo_la_SOURCES = invert.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = invert.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/irissquare/Makefile.am b/plugins/irissquare/Makefile.am index f41bdd21..302b0e49 100644 --- a/plugins/irissquare/Makefile.am +++ b/plugins/irissquare/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = irissquare.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/ivtc/Makefile.am b/plugins/ivtc/Makefile.am index cc8e1ae6..7d1ef577 100644 --- a/plugins/ivtc/Makefile.am +++ b/plugins/ivtc/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = ivtc.h ivtcwindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/lame/Makefile.am b/plugins/lame/Makefile.am index dd8cdce7..23ab05b2 100644 --- a/plugins/lame/Makefile.am +++ b/plugins/lame/Makefile.am @@ -9,3 +9,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I/usr/include/lame LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = brhist.h get_audio.h lametime.h main.h parse.h portableio.h timestatus.h diff --git a/plugins/level/Makefile.am b/plugins/level/Makefile.am index d8d10795..8ee2777e 100644 --- a/plugins/level/Makefile.am +++ b/plugins/level/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = leveleffect.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/libcolors/Makefile.am b/plugins/libcolors/Makefile.am index 82140108..778dc0cb 100644 --- a/plugins/libcolors/Makefile.am +++ b/plugins/libcolors/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = colorpicker.h colorpicker.inc plugincolors.h diff --git a/plugins/libeffecttv/Makefile.am b/plugins/libeffecttv/Makefile.am index 52f9feec..ab882f1a 100644 --- a/plugins/libeffecttv/Makefile.am +++ b/plugins/libeffecttv/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = effecttv.h effecttv.inc diff --git a/plugins/libfourier/Makefile.am b/plugins/libfourier/Makefile.am index 2c6469d8..3daf5a14 100644 --- a/plugins/libfourier/Makefile.am +++ b/plugins/libfourier/Makefile.am @@ -3,3 +3,5 @@ libfourier_la_SOURCES=fourier.C libfourier_la_LDFLAGS=-avoid-version -shared INCLUDES = -I$(top_srcdir)/guicast LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = fourier.h diff --git a/plugins/linearblur/Makefile.am b/plugins/linearblur/Makefile.am index 756da782..3d0000e5 100644 --- a/plugins/linearblur/Makefile.am +++ b/plugins/linearblur/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/microtheme/Makefile.am b/plugins/microtheme/Makefile.am index 50a5eba1..dd352ff1 100644 --- a/plugins/microtheme/Makefile.am +++ b/plugins/microtheme/Makefile.am @@ -7,3 +7,26 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = microtheme.h + +EXTRA_DIST = data \ + apply.xcf.bz2 \ + buttonbars.xcf.bz2 \ + checkbox.xcf.bz2 \ + expandpatch.xcf.bz2 \ + generic_button.xcf.bz2 \ + genericbutton.xcf.bz2 \ + levels.xcf.bz2 \ + pan.xcf.bz2 \ + patches.xcf.bz2 \ + radial.xcf.bz2 \ + scrollbar.xcf.bz2 \ + setaudio.xcf.bz2 \ + slider.xcf.bz2 \ + statusbar_cancel.xcf.bz2 \ + transportbuttons.xcf.bz2 + +dist-hook: + -rm -rf $(distdir)/data/CVS + diff --git a/plugins/motion/Makefile.am b/plugins/motion/Makefile.am index 45de6453..fdf4c2f8 100644 --- a/plugins/motion/Makefile.am +++ b/plugins/motion/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = motion.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/normalize/Makefile.am b/plugins/normalize/Makefile.am index e912889c..7b6e94d8 100644 --- a/plugins/normalize/Makefile.am +++ b/plugins/normalize/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = normalize.h normalizewindow.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/oilpainting/Makefile.am b/plugins/oilpainting/Makefile.am index 3d6ac7a4..d97726b5 100644 --- a/plugins/oilpainting/Makefile.am +++ b/plugins/oilpainting/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = oil.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/parametric/Makefile.am b/plugins/parametric/Makefile.am index eff61354..5a7ba7c3 100644 --- a/plugins/parametric/Makefile.am +++ b/plugins/parametric/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = parametric.la parametric_la_LDFLAGS = -avoid-version -module -shared -parametric_la_LIBADD = $(top_srcdir)/plugins/libfourier/libfourier.la +parametric_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la parametric_la_SOURCES = parametric.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libfourier LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = parametric.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/perspective/Makefile.am b/plugins/perspective/Makefile.am index f41ef932..bd76f810 100644 --- a/plugins/perspective/Makefile.am +++ b/plugins/perspective/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = perspective.h picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/pitch/Makefile.am b/plugins/pitch/Makefile.am index 4146d52e..1e6e0ef1 100644 --- a/plugins/pitch/Makefile.am +++ b/plugins/pitch/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = pitch.la pitch_la_LDFLAGS = -avoid-version -module -shared -pitch_la_LIBADD = $(top_srcdir)/plugins/libfourier/libfourier.la +pitch_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la pitch_la_SOURCES = pitch.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libfourier LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h pitch.h +EXTRA_DIST = picon.png diff --git a/plugins/polar/Makefile.am b/plugins/polar/Makefile.am index 172159dd..42b4a8d7 100644 --- a/plugins/polar/Makefile.am +++ b/plugins/polar/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h polar.h +EXTRA_DIST = picon.png diff --git a/plugins/quark/Makefile.am b/plugins/quark/Makefile.am index 4a371a56..9310f32a 100644 --- a/plugins/quark/Makefile.am +++ b/plugins/quark/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h quark.h quarkwindow.h +EXTRA_DIST = picon.png diff --git a/plugins/radialblur/Makefile.am b/plugins/radialblur/Makefile.am index 86d051c3..261751df 100644 --- a/plugins/radialblur/Makefile.am +++ b/plugins/radialblur/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/reframe/Makefile.am b/plugins/reframe/Makefile.am index 31e02d58..6139bbfc 100644 --- a/plugins/reframe/Makefile.am +++ b/plugins/reframe/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h reframe.h +EXTRA_DIST = picon.png diff --git a/plugins/resample/Makefile.am b/plugins/resample/Makefile.am index 06bb2f10..2e20bb24 100644 --- a/plugins/resample/Makefile.am +++ b/plugins/resample/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h resample.h +EXTRA_DIST = picon.png diff --git a/plugins/reverb/Makefile.am b/plugins/reverb/Makefile.am index 5b2d3e01..9a8e53ad 100644 --- a/plugins/reverb/Makefile.am +++ b/plugins/reverb/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h reverb.h reverb.inc reverbwindow.h reverbwindow.inc +EXTRA_DIST = picon.png diff --git a/plugins/reverseaudio/Makefile.am b/plugins/reverseaudio/Makefile.am index 93854710..02335ea2 100644 --- a/plugins/reverseaudio/Makefile.am +++ b/plugins/reverseaudio/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = reverseaudio.h diff --git a/plugins/reversevideo/Makefile.am b/plugins/reversevideo/Makefile.am index a06874de..ce37e3ce 100644 --- a/plugins/reversevideo/Makefile.am +++ b/plugins/reversevideo/Makefile.am @@ -7,3 +7,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = reversevideo.h diff --git a/plugins/rgb601/Makefile.am b/plugins/rgb601/Makefile.am index c0c9ebd6..7469dd9c 100644 --- a/plugins/rgb601/Makefile.am +++ b/plugins/rgb601/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h rgb601.h rgb601window.h +EXTRA_DIST = picon.png diff --git a/plugins/rotate/Makefile.am b/plugins/rotate/Makefile.am index f789a073..e14f72a7 100644 --- a/plugins/rotate/Makefile.am +++ b/plugins/rotate/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h rotate.h +EXTRA_DIST = picon.png diff --git a/plugins/scale/Makefile.am b/plugins/scale/Makefile.am index c10d15b9..ec8b155c 100644 --- a/plugins/scale/Makefile.am +++ b/plugins/scale/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h scale.h scalewin.h +EXTRA_DIST = picon.png diff --git a/plugins/sharpen/Makefile.am b/plugins/sharpen/Makefile.am index c530e1aa..e01078ec 100644 --- a/plugins/sharpen/Makefile.am +++ b/plugins/sharpen/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h sharpen.h sharpenwindow.h +EXTRA_DIST = picon.png diff --git a/plugins/shiftinterlace/Makefile.am b/plugins/shiftinterlace/Makefile.am index da4ac792..59be8f7a 100644 --- a/plugins/shiftinterlace/Makefile.am +++ b/plugins/shiftinterlace/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/slide/Makefile.am b/plugins/slide/Makefile.am index ea1b97c5..3bacfabe 100644 --- a/plugins/slide/Makefile.am +++ b/plugins/slide/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h slide.h +EXTRA_DIST = picon.png diff --git a/plugins/spectrogram/Makefile.am b/plugins/spectrogram/Makefile.am index 925c5f5a..50cec64e 100644 --- a/plugins/spectrogram/Makefile.am +++ b/plugins/spectrogram/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libfourier LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h spectrogram.h +EXTRA_DIST = picon.png diff --git a/plugins/svg/Makefile.am b/plugins/svg/Makefile.am index 403c89d6..61a06357 100644 --- a/plugins/svg/Makefile.am +++ b/plugins/svg/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = empty_svg.h picon_png.h svg.h svgwin.h +EXTRA_DIST = picon.png diff --git a/plugins/swapchannels/Makefile.am b/plugins/swapchannels/Makefile.am index 89ebb8c8..5ffd9655 100644 --- a/plugins/swapchannels/Makefile.am +++ b/plugins/swapchannels/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h swapchannels.h +EXTRA_DIST = picon.png diff --git a/plugins/synthesizer/Makefile.am b/plugins/synthesizer/Makefile.am index 81fb51cb..d5bccacc 100644 --- a/plugins/synthesizer/Makefile.am +++ b/plugins/synthesizer/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h synthesizer.h synthesizer.inc synthwindow.inc +EXTRA_DIST = picon.png diff --git a/plugins/timeavg/Makefile.am b/plugins/timeavg/Makefile.am index 95957256..e4a39299 100644 --- a/plugins/timeavg/Makefile.am +++ b/plugins/timeavg/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h timeavg.h timeavgwindow.h +EXTRA_DIST = picon.png diff --git a/plugins/timestretch/Makefile.am b/plugins/timestretch/Makefile.am index 6c83fec1..96876f62 100644 --- a/plugins/timestretch/Makefile.am +++ b/plugins/timestretch/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libfourier LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h timestretch.h timestretchengine.h timestretchengine.inc +EXTRA_DIST = picon.png diff --git a/plugins/titler/Makefile.am b/plugins/titler/Makefile.am index d01fd8d4..3221a7bc 100644 --- a/plugins/titler/Makefile.am +++ b/plugins/titler/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = titler.la titler_la_LDFLAGS = -avoid-version -module -shared -titler_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la -lfreetype +titler_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la -lfreetype titler_la_SOURCES = title.C titlewindow.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I/usr/include/freetype2 -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h title.h titlewindow.h +EXTRA_DIST = picon.png diff --git a/plugins/toolame/Makefile.am b/plugins/toolame/Makefile.am index 72f9bb28..838fcf3a 100644 --- a/plugins/toolame/Makefile.am +++ b/plugins/toolame/Makefile.am @@ -8,3 +8,5 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = absthr.h alloc.h common.h critband.h encoder.h enwindow.h freqtable.h ieeefloat.h portableio.h diff --git a/plugins/translate/Makefile.am b/plugins/translate/Makefile.am index d16a275c..f6aee379 100644 --- a/plugins/translate/Makefile.am +++ b/plugins/translate/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h translate.h translatewin.h +EXTRA_DIST = picon.png diff --git a/plugins/videoscope/Makefile.am b/plugins/videoscope/Makefile.am index 060630d5..2d7c85ff 100644 --- a/plugins/videoscope/Makefile.am +++ b/plugins/videoscope/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = videoscope.la videoscope_la_LDFLAGS = -avoid-version -module -shared -videoscope_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +videoscope_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la videoscope_la_SOURCES = videoscope.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/wave/Makefile.am b/plugins/wave/Makefile.am index af08e6ec..ba0bd740 100644 --- a/plugins/wave/Makefile.am +++ b/plugins/wave/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/plugins/whirl/Makefile.am b/plugins/whirl/Makefile.am index 64820a72..4781382d 100644 --- a/plugins/whirl/Makefile.am +++ b/plugins/whirl/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h whirl.h +EXTRA_DIST = picon.png diff --git a/plugins/wipe/Makefile.am b/plugins/wipe/Makefile.am index 57d0a8a0..4ae60bf8 100644 --- a/plugins/wipe/Makefile.am +++ b/plugins/wipe/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h wipe.h +EXTRA_DIST = picon.png diff --git a/plugins/yuv/Makefile.am b/plugins/yuv/Makefile.am index acf89497..f363c7e0 100644 --- a/plugins/yuv/Makefile.am +++ b/plugins/yuv/Makefile.am @@ -1,9 +1,12 @@ plugin_LTLIBRARIES = yuv.la yuv_la_LDFLAGS = -avoid-version -module -shared -yuv_la_LIBADD = $(top_srcdir)/plugins/libcolors/libcolors.la +yuv_la_LIBADD = $(top_builddir)/plugins/libcolors/libcolors.la yuv_la_SOURCES = yuv.C AM_CFLAGS = AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libcolors LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h yuv.h +EXTRA_DIST = picon.png diff --git a/plugins/zoomblur/Makefile.am b/plugins/zoomblur/Makefile.am index 5ecb8c89..6c6b008c 100644 --- a/plugins/zoomblur/Makefile.am +++ b/plugins/zoomblur/Makefile.am @@ -7,3 +7,6 @@ AM_CXXFLAGS = INCLUDES = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS) + +noinst_HEADERS = picon_png.h +EXTRA_DIST = picon.png diff --git a/po/de.po b/po/de.po index 3c6d9aac..53954ba3 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: cinelerra 1.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-10-16 18:18+0200\n" +"POT-Creation-Date: 2003-11-10 01:09+0100\n" "PO-Revision-Date: 2003-10-15 15:00+0200\n" "Last-Translator: Jens Seidel \n" "Language-Team: de \n" @@ -86,8 +86,8 @@ msgstr "Audio" msgid "Tracks:" msgstr "Spuren:" -#: cinelerra/new.C:375 cinelerra/adeviceprefs.C:281 -#: cinelerra/adeviceprefs.C:366 cinelerra/adeviceprefs.C:483 +#: cinelerra/new.C:375 cinelerra/adeviceprefs.C:287 +#: cinelerra/adeviceprefs.C:372 cinelerra/adeviceprefs.C:489 #: cinelerra/assetedit.C:229 cinelerra/fileformat.C:58 #: cinelerra/setaudio.C:185 cinelerra/setformat.C:275 msgid "Channels:" @@ -293,42 +293,46 @@ msgstr "" "Quicktime Version %d.%d.%d\n" "Libmpeg3 Version %d.%d.%d\n" -#: cinelerra/adeviceprefs.C:233 cinelerra/vdeviceprefs.C:166 -#: cinelerra/vdeviceprefs.C:187 cinelerra/vdeviceprefs.C:291 +#: cinelerra/adeviceprefs.C:239 cinelerra/vdeviceprefs.C:168 +#: cinelerra/vdeviceprefs.C:189 cinelerra/vdeviceprefs.C:311 msgid "Device path:" msgstr "Gerätepfad:" -#: cinelerra/adeviceprefs.C:255 cinelerra/adeviceprefs.C:341 +#: cinelerra/adeviceprefs.C:261 cinelerra/adeviceprefs.C:347 #: cinelerra/assetedit.C:266 cinelerra/fileformat.C:70 #: cinelerra/formatwindow.C:27 msgid "Bits:" msgstr "Bits:" -#: cinelerra/adeviceprefs.C:320 +#: cinelerra/adeviceprefs.C:326 msgid "Device:" msgstr "Gerät:" -#: cinelerra/adeviceprefs.C:392 +#: cinelerra/adeviceprefs.C:398 msgid "Server:" msgstr "Server:" -#: cinelerra/adeviceprefs.C:408 cinelerra/adeviceprefs.C:451 -#: cinelerra/performanceprefs.C:116 cinelerra/vdeviceprefs.C:247 +#: cinelerra/adeviceprefs.C:414 cinelerra/adeviceprefs.C:457 +#: cinelerra/performanceprefs.C:116 cinelerra/vdeviceprefs.C:249 msgid "Port:" msgstr "Port:" -#: cinelerra/adeviceprefs.C:433 cinelerra/vdeviceprefs.C:232 +#: cinelerra/adeviceprefs.C:439 cinelerra/vdeviceprefs.C:234 msgid "Device Path:" msgstr "Gerätepfad:" -#: cinelerra/adeviceprefs.C:466 cinelerra/vdeviceprefs.C:262 +#: cinelerra/adeviceprefs.C:472 cinelerra/vdeviceprefs.C:264 msgid "Channel:" msgstr "Kanal:" -#: cinelerra/adeviceprefs.C:501 cinelerra/vdeviceprefs.C:279 +#: cinelerra/adeviceprefs.C:507 cinelerra/vdeviceprefs.C:281 msgid "Syt Offset:" msgstr "" +#: cinelerra/adeviceprefs.C:527 cinelerra/vdeviceprefs.C:300 +msgid "Use DV1394" +msgstr "" + #: cinelerra/amodule.C:193 cinelerra/amodule.C:269 #, c-format msgid "VirtualAConsole::load_track Couldn't open %s.\n" @@ -466,22 +470,22 @@ msgstr "Soll es permanent von der Festplatte gel msgid "Audio %d" msgstr "Audio %d" -#: cinelerra/audiooutprefs.C:44 cinelerra/audiooutprefs.C:108 -#: cinelerra/audiooutprefs.C:117 cinelerra/playbackprefs.C:47 -#: cinelerra/playbackprefs.C:164 cinelerra/playbackprefs.C:173 +#: cinelerra/audiooutprefs.C:44 cinelerra/audiooutprefs.C:102 +#: cinelerra/audiooutprefs.C:111 cinelerra/playbackprefs.C:47 +#: cinelerra/playbackprefs.C:158 cinelerra/playbackprefs.C:167 #: cinelerra/videooutprefs.C:40 cinelerra/videooutprefs.C:106 #: cinelerra/videooutprefs.C:115 msgid "Local Host" msgstr "Lokaler Rechner" -#: cinelerra/audiooutprefs.C:45 cinelerra/audiooutprefs.C:111 -#: cinelerra/playbackprefs.C:48 cinelerra/playbackprefs.C:167 +#: cinelerra/audiooutprefs.C:45 cinelerra/audiooutprefs.C:105 +#: cinelerra/playbackprefs.C:48 cinelerra/playbackprefs.C:161 #: cinelerra/videooutprefs.C:41 cinelerra/videooutprefs.C:109 msgid "Multihead" msgstr "" -#: cinelerra/audiooutprefs.C:46 cinelerra/audiooutprefs.C:114 -#: cinelerra/playbackprefs.C:49 cinelerra/playbackprefs.C:170 +#: cinelerra/audiooutprefs.C:46 cinelerra/audiooutprefs.C:108 +#: cinelerra/playbackprefs.C:49 cinelerra/playbackprefs.C:164 #: cinelerra/videooutprefs.C:42 cinelerra/videooutprefs.C:112 msgid "Blond Symphony" msgstr "" @@ -494,58 +498,51 @@ msgstr "Audio-Ausgabe" msgid "Samples to read from disk at a time:" msgstr "Von der Platte pro Zeiteinheit zu lesende Samples:" -#. TRANSLATORS: -#. only the part before ':' is used, the rest is an explanation -#: cinelerra/audiooutprefs.C:65 cinelerra/audiooutprefs.C:72 -#: cinelerra/playbackprefs.C:68 cinelerra/playbackprefs.C:75 -msgid "275: offset of 'Samples to read/send ...' labels" -msgstr "400" - -#: cinelerra/audiooutprefs.C:68 cinelerra/playbackprefs.C:71 +#: cinelerra/audiooutprefs.C:65 cinelerra/playbackprefs.C:68 msgid "Samples to send to console at a time:" msgstr "Auf die Konsole pro Zeiteinheit auszugebende Samples:" -#: cinelerra/audiooutprefs.C:83 cinelerra/playbackprefs.C:86 +#: cinelerra/audiooutprefs.C:77 cinelerra/playbackprefs.C:80 msgid "Audio Driver:" msgstr "Audiotreiber:" -#: cinelerra/audiooutprefs.C:160 cinelerra/audiooutprefs.C:180 -#: cinelerra/playbackprefs.C:216 cinelerra/playbackprefs.C:236 +#: cinelerra/audiooutprefs.C:154 cinelerra/audiooutprefs.C:174 +#: cinelerra/playbackprefs.C:210 cinelerra/playbackprefs.C:230 #: cinelerra/videooutprefs.C:167 cinelerra/videooutprefs.C:178 msgid "Head:" msgstr "Kopf:" -#: cinelerra/audiooutprefs.C:164 cinelerra/audiooutprefs.C:184 -#: cinelerra/playbackprefs.C:220 cinelerra/playbackprefs.C:240 +#: cinelerra/audiooutprefs.C:158 cinelerra/audiooutprefs.C:178 +#: cinelerra/playbackprefs.C:214 cinelerra/playbackprefs.C:234 msgid "Total Heads:" msgstr "Gesamtzahl der Köpfe:" -#: cinelerra/audiooutprefs.C:169 cinelerra/audiooutprefs.C:192 -#: cinelerra/playbackprefs.C:142 cinelerra/playbackprefs.C:225 -#: cinelerra/playbackprefs.C:248 cinelerra/videooutprefs.C:156 +#: cinelerra/audiooutprefs.C:163 cinelerra/audiooutprefs.C:186 +#: cinelerra/playbackprefs.C:136 cinelerra/playbackprefs.C:219 +#: cinelerra/playbackprefs.C:242 cinelerra/videooutprefs.C:156 #: cinelerra/videooutprefs.C:190 msgid "Video Driver:" msgstr "Videotreiber:" -#: cinelerra/audiooutprefs.C:188 cinelerra/performanceprefs.C:115 -#: cinelerra/playbackprefs.C:244 +#: cinelerra/audiooutprefs.C:182 cinelerra/performanceprefs.C:115 +#: cinelerra/playbackprefs.C:238 msgid "Hostname:" msgstr "Rechnername:" -#: cinelerra/audiooutprefs.C:366 cinelerra/playbackprefs.C:439 +#: cinelerra/audiooutprefs.C:360 cinelerra/playbackprefs.C:433 msgid "Disable tracks when no edits." msgstr "Deaktivieren der Spuren bei ausbleibender Änderung." -#: cinelerra/audiooutprefs.C:381 cinelerra/playbackprefs.C:454 +#: cinelerra/audiooutprefs.C:375 cinelerra/playbackprefs.C:448 msgid "View follows playback" msgstr "Ansicht folgt Wiedergabe" -#: cinelerra/audiooutprefs.C:396 cinelerra/playbackprefs.C:469 -#: cinelerra/recordprefs.C:291 cinelerra/videoinprefs.C:174 +#: cinelerra/audiooutprefs.C:390 cinelerra/playbackprefs.C:463 +#: cinelerra/recordprefs.C:288 cinelerra/videoinprefs.C:174 msgid "Use software for positioning information" msgstr "Software zu Positionierungsinformationen verwenden" -#: cinelerra/audiooutprefs.C:411 cinelerra/playbackprefs.C:484 +#: cinelerra/audiooutprefs.C:405 cinelerra/playbackprefs.C:478 msgid "Audio playback in real time priority (root only)" msgstr "Audio-Wiedergabe in Echtzeit-Priorität (nur root)" @@ -2432,7 +2429,8 @@ msgid "Total jobs to create:" msgstr "Gesamtanzahl der zu erzeugenden Jobs:" #: cinelerra/performanceprefs.C:171 -msgid "(overridden if \"Create new file at each label\" is checked)" +#, fuzzy +msgid "(overridden if new file at each label is checked)" msgstr "" "(wird überschrieben, wenn \"Erzeuge neue Datei an jeder Markierung\" gewählt " "ist)" @@ -2494,44 +2492,44 @@ msgstr "Raten zur msgid "Use virtual filesystem" msgstr "Virtuelles Dateisystem verwenden" -#: cinelerra/playbackprefs.C:103 +#: cinelerra/playbackprefs.C:97 msgid "Video Out" msgstr "Video Aus" -#: cinelerra/playbackprefs.C:108 cinelerra/videooutprefs.C:58 +#: cinelerra/playbackprefs.C:102 cinelerra/videooutprefs.C:58 msgid "Framerate achieved:" msgstr "Erreichte Framerate:" -#: cinelerra/playbackprefs.C:109 cinelerra/videooutprefs.C:59 +#: cinelerra/playbackprefs.C:103 cinelerra/videooutprefs.C:59 #: cinelerra/zoombar.C:65 cinelerra/zoombar.C:67 msgid "--" msgstr "--" -#: cinelerra/playbackprefs.C:113 cinelerra/videooutprefs.C:64 +#: cinelerra/playbackprefs.C:107 cinelerra/videooutprefs.C:64 msgid "Scaling equation:" msgstr "Skalierungsformel:" -#: cinelerra/playbackprefs.C:134 cinelerra/videooutprefs.C:79 +#: cinelerra/playbackprefs.C:128 cinelerra/videooutprefs.C:79 msgid "Preload buffer for Quicktime:" msgstr "Vorlade-Puffer für Quicktime:" -#: cinelerra/playbackprefs.C:502 +#: cinelerra/playbackprefs.C:496 msgid "Nearest neighbor enlarge and reduce" msgstr "Nächster Nachbar für Vergrößerung und Reduzierung" -#: cinelerra/playbackprefs.C:518 +#: cinelerra/playbackprefs.C:512 msgid "Bicubic enlarge and reduce" msgstr "Bikubische Vergrößerung und Reduzierung" -#: cinelerra/playbackprefs.C:533 +#: cinelerra/playbackprefs.C:527 msgid "Bicubic enlarge and bilinear reduce" msgstr "Bikubische Vergrößerung und bilineare Reduzierung" -#: cinelerra/playbackprefs.C:550 +#: cinelerra/playbackprefs.C:544 msgid "Bilinear enlarge and bilinear reduce" msgstr "Bilineare Vergrößerung und bilineare Reduzierung" -#: cinelerra/playbackprefs.C:582 cinelerra/videooutprefs.C:273 +#: cinelerra/playbackprefs.C:576 cinelerra/videooutprefs.C:273 msgid "Play every frame" msgstr "Jeden Frame abspielen" @@ -2881,7 +2879,7 @@ msgstr "Beenden ohne ins Projekt einzuf msgid "Rewind batch and overwrite?" msgstr "Batch zurückspulen und überschreiben?" -#: cinelerra/recordmonitor.C:471 cinelerra/vdeviceprefs.C:195 +#: cinelerra/recordmonitor.C:471 cinelerra/vdeviceprefs.C:197 msgid "Swap fields" msgstr "Felder austauschen" @@ -2889,7 +2887,7 @@ msgstr "Felder austauschen" msgid "Audio In" msgstr "Audio Eingabe" -#: cinelerra/recordprefs.C:40 cinelerra/recordprefs.C:89 +#: cinelerra/recordprefs.C:40 cinelerra/recordprefs.C:86 #: cinelerra/videoinprefs.C:37 msgid "Record Driver:" msgstr "Aufnahmetreiber:" @@ -2898,41 +2896,35 @@ msgstr "Aufnahmetreiber:" msgid "Samples to write to disk at a time:" msgstr "Samples die pro Zeiteinheit auf die Platte zu schreiben sind:" -#. TRANSLATORS: -#. * only the part before ':' is used, the rest is an explanation -#: cinelerra/recordprefs.C:70 -msgid "240: offset of 'Samples to write ...' label" -msgstr "450" - -#: cinelerra/recordprefs.C:77 +#: cinelerra/recordprefs.C:74 msgid "Sample rate for recording:" msgstr "Abtastrate für die Aufnahme:" -#: cinelerra/recordprefs.C:86 cinelerra/videoinprefs.C:34 +#: cinelerra/recordprefs.C:83 cinelerra/videoinprefs.C:34 msgid "Video In" msgstr "Video Eingang" -#: cinelerra/recordprefs.C:103 cinelerra/videoinprefs.C:51 +#: cinelerra/recordprefs.C:100 cinelerra/videoinprefs.C:51 msgid "Frames to record to disk at a time:" msgstr "Frames die pro Zeiteinheit auf die Platte zu schreiben sind:" -#: cinelerra/recordprefs.C:108 cinelerra/videoinprefs.C:56 +#: cinelerra/recordprefs.C:105 cinelerra/videoinprefs.C:56 msgid "Frames to buffer in device:" msgstr "Zu puffernde Frames im Gerät:" -#: cinelerra/recordprefs.C:123 cinelerra/videoinprefs.C:71 +#: cinelerra/recordprefs.C:120 cinelerra/videoinprefs.C:71 msgid "Size of captured frame:" msgstr "Größe der erfassten Frame:" -#: cinelerra/recordprefs.C:139 +#: cinelerra/recordprefs.C:136 msgid "Frame rate for recording:" msgstr "Frame-Rate für die Aufnahme:" -#: cinelerra/recordprefs.C:165 +#: cinelerra/recordprefs.C:162 msgid "Record in realtime priority (root only)" msgstr "Aufnahme in Echtzeit-Priorität (nur root)" -#: cinelerra/recordprefs.C:305 cinelerra/videoinprefs.C:188 +#: cinelerra/recordprefs.C:302 cinelerra/videoinprefs.C:188 msgid "Sync drives automatically" msgstr "Manuelle Gerätesynchronisation" @@ -3255,15 +3247,15 @@ msgstr "VDeviceLML::read_buffer: Treiber st msgid "VDeviceLML::read_buffer: reopened\n" msgstr "VDeviceLML::read_buffer: neu geöffnet\n" -#: cinelerra/vdeviceprefs.C:200 +#: cinelerra/vdeviceprefs.C:202 msgid "Output channel:" msgstr "Ausgabe-Kanal:" -#: cinelerra/vdeviceprefs.C:301 +#: cinelerra/vdeviceprefs.C:321 msgid "Display:" msgstr "Anzeige:" -#: cinelerra/vdeviceprefs.C:311 +#: cinelerra/vdeviceprefs.C:331 msgid "Display for compositor:" msgstr "Anzeige für Compositor:" @@ -3351,9 +3343,10 @@ msgstr "Normal" msgid "Replace" msgstr "Ersetzen" -#: cinelerra/vpatchgui.C:318 plugins/synthesizer/synthesizer.C:875 -msgid "Add" -msgstr "Addiere" +#: cinelerra/vpatchgui.C:318 +#, fuzzy +msgid "Addition" +msgstr "Bearbeitung" #: cinelerra/vpatchgui.C:322 msgid "Subtract" @@ -4661,6 +4654,10 @@ msgstr "Impuls" msgid "Noise" msgstr "Rauschen" +#: plugins/synthesizer/synthesizer.C:875 +msgid "Add" +msgstr "Addiere" + #: plugins/synthesizer/synthesizer.C:1147 #: plugins/synthesizer/synthesizer.C:1336 msgid "Zero" @@ -4930,3 +4927,9 @@ msgstr "YUV" #: plugins/zoomblur/zoomblur.C:383 msgid "Zoom Blur" msgstr "" + +#~ msgid "275: offset of 'Samples to read/send ...' labels" +#~ msgstr "400" + +#~ msgid "240: offset of 'Samples to write ...' label" +#~ msgstr "450" diff --git a/po/sl.po b/po/sl.po index a28584c2..a84c57b7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: sl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-10-13 00:20+0200\n" +"POT-Creation-Date: 2003-11-10 01:09+0100\n" "PO-Revision-Date: 2003-10-13 00:17+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -117,8 +117,8 @@ msgstr "Zvok" msgid "Tracks:" msgstr "Steze:" -#: cinelerra/new.C:375 cinelerra/adeviceprefs.C:281 -#: cinelerra/adeviceprefs.C:366 cinelerra/adeviceprefs.C:483 +#: cinelerra/new.C:375 cinelerra/adeviceprefs.C:287 +#: cinelerra/adeviceprefs.C:372 cinelerra/adeviceprefs.C:489 #: cinelerra/assetedit.C:229 cinelerra/fileformat.C:58 #: cinelerra/setaudio.C:185 cinelerra/setformat.C:275 msgid "Channels:" @@ -129,15 +129,6 @@ msgstr "Kanali:" msgid "Samplerate:" msgstr "Frek. vzorè.:" -#. add_subwindow(new BC_Title(x, y, _("Playback"), LARGEFONT, BLACK)); -#. x += 200; -#. add_subwindow(new BC_Title(x, y, _("Strategy:"))); -#. popup = new PlaybackStrategy(this, x + 70, y); -#. popup->create_objects(); -#. x = 10; -#. y += popup->get_h() + 30; -#. Global playback options -#. All strategies use these #: cinelerra/new.C:391 cinelerra/mainmenu.C:132 cinelerra/setformat.C:309 #: cinelerra/videooutprefs.C:55 msgid "Video" @@ -151,9 +142,6 @@ msgstr "Frekv. slik:" msgid "Canvas size:" msgstr "Platno:" -#. add_subwindow(new ScaleConstrain(x, y, thread)); -#. x = 10; -#. y += 80; #: cinelerra/new.C:451 cinelerra/scale.C:249 cinelerra/setformat.C:386 #: cinelerra/setvideo.C:323 msgid "Aspect ratio:" @@ -221,7 +209,6 @@ msgstr "Snemanje..." msgid "Record::run_script: Unrecognized command: %s\n" msgstr "Record::run_script: Nepoznan ukaz: %s\n" -#. no plugin #: cinelerra/record.C:441 cinelerra/channeledit.C:564 #: cinelerra/plugindialog.C:211 cinelerra/recordgui.C:234 #: cinelerra/sharedlocation.C:104 cinelerra/sharedlocation.C:109 @@ -234,12 +221,10 @@ msgstr "Brez" msgid "render" msgstr "upodabljanje" -#. Update GUI #: cinelerra/record.C:774 msgid "Deleting" msgstr "Bri¹em" -#. Update GUI #: cinelerra/record.C:781 msgid "OK" msgstr "V redu" @@ -253,7 +238,6 @@ msgstr "Upodabljanje..." msgid "Rendering %s..." msgstr "Upodabljam %s..." -#. Don't bother with the filename since renderfarm defeats the meaning #: cinelerra/render.C:224 msgid "Rendering..." msgstr "Upodabljam..." @@ -300,11 +284,12 @@ msgid "Build date: " msgstr "Datum izgradnje" #: cinelerra/aboutprefs.C:79 +#, fuzzy msgid "" "This program is free software; you can\n" "redistribute it and/or modify it under the terms\n" "of the GNU General Public License as published\n" -"by the Free Software Foundation; either version\n" +"by the Free Software Foundation; either version\n" "2 of the License, or (at your option) any later\n" "version.\n" "\n" @@ -337,43 +322,46 @@ msgstr "" "Razlièica Quicktime %d.%d.%d\n" "Razlièica Libmpeg3 %d.%d.%d\n" -#: cinelerra/adeviceprefs.C:233 cinelerra/vdeviceprefs.C:166 -#: cinelerra/vdeviceprefs.C:187 cinelerra/vdeviceprefs.C:291 +#: cinelerra/adeviceprefs.C:239 cinelerra/vdeviceprefs.C:168 +#: cinelerra/vdeviceprefs.C:189 cinelerra/vdeviceprefs.C:311 msgid "Device path:" msgstr "Pot naprave:" -#: cinelerra/adeviceprefs.C:255 cinelerra/adeviceprefs.C:341 +#: cinelerra/adeviceprefs.C:261 cinelerra/adeviceprefs.C:347 #: cinelerra/assetedit.C:266 cinelerra/fileformat.C:70 #: cinelerra/formatwindow.C:27 msgid "Bits:" msgstr "Biti:" -#: cinelerra/adeviceprefs.C:320 +#: cinelerra/adeviceprefs.C:326 msgid "Device:" msgstr "Naprava:" -#: cinelerra/adeviceprefs.C:392 +#: cinelerra/adeviceprefs.C:398 msgid "Server:" msgstr "Stre¾nik:" -#: cinelerra/adeviceprefs.C:408 cinelerra/adeviceprefs.C:451 -#: cinelerra/performanceprefs.C:116 cinelerra/vdeviceprefs.C:247 +#: cinelerra/adeviceprefs.C:414 cinelerra/adeviceprefs.C:457 +#: cinelerra/performanceprefs.C:116 cinelerra/vdeviceprefs.C:249 msgid "Port:" msgstr "Vrata:" -#: cinelerra/adeviceprefs.C:433 cinelerra/vdeviceprefs.C:232 +#: cinelerra/adeviceprefs.C:439 cinelerra/vdeviceprefs.C:234 msgid "Device Path:" msgstr "Pot naprave:" -#: cinelerra/adeviceprefs.C:466 cinelerra/vdeviceprefs.C:262 +#: cinelerra/adeviceprefs.C:472 cinelerra/vdeviceprefs.C:264 msgid "Channel:" msgstr "Kanal:" -#: cinelerra/adeviceprefs.C:501 cinelerra/vdeviceprefs.C:279 +#: cinelerra/adeviceprefs.C:507 cinelerra/vdeviceprefs.C:281 msgid "Syt Offset:" msgstr "Odmik syt:" -#. couldn't open source file / skip the edit +#: cinelerra/adeviceprefs.C:527 cinelerra/vdeviceprefs.C:300 +msgid "Use DV1394" +msgstr "" + #: cinelerra/amodule.C:193 cinelerra/amodule.C:269 #, c-format msgid "VirtualAConsole::load_track Couldn't open %s.\n" @@ -414,8 +402,8 @@ msgstr "Zvok:" #: cinelerra/assetedit.C:217 cinelerra/assetedit.C:352 #: cinelerra/filemov.C:1231 cinelerra/filemov.C:1500 -#: cinelerra/filesndfile.C:360 cinelerra/filetga.C:904 -#: cinelerra/formatwindow.C:87 +#: cinelerra/filesndfile.C:363 cinelerra/filesndfile.C:815 +#: cinelerra/filetga.C:904 cinelerra/formatwindow.C:87 msgid "Compression:" msgstr "Kompresija:" @@ -428,7 +416,8 @@ msgid "Header length:" msgstr "Dol¾ina glave:" #: cinelerra/assetedit.C:299 cinelerra/fileformat.C:88 -#: cinelerra/filesndfile.C:379 cinelerra/formatwindow.C:43 +#: cinelerra/filesndfile.C:382 cinelerra/filesndfile.C:834 +#: cinelerra/formatwindow.C:43 msgid "Byte order:" msgstr "Zapis bajtov:" @@ -449,7 +438,6 @@ msgstr "Vrednosti so nepredzna msgid "Values are signed" msgstr "Vrednosti so predznaèene" -#. printf("FormatTools::create_objects 8\n"); #: cinelerra/assetedit.C:346 cinelerra/formattools.C:166 msgid "Video:" msgstr "Video:" @@ -482,11 +470,6 @@ msgstr "Znova zgradi kazalo" msgid "Sort items" msgstr "Razvrsti predmete" -#. set scrubbing speed -#. ScrubSpeed *scrub_speed; -#. settingsmenu->add_item(scrub_speed = new ScrubSpeed(mwindow)); -#. if(mwindow->edl->session->scrub_speed == .5) -#. scrub_speed->set_text(_("Fast Shuttle")); #: cinelerra/assetpopup.C:184 cinelerra/mainmenu.C:166 msgid "View" msgstr "Pogled" @@ -536,15 +519,6 @@ msgstr "Ve msgid "Blond Symphony" msgstr "Blond Symphony" -#. add_subwindow(new BC_Title(x, y, _("Playback"), LARGEFONT, BLACK)); -#. x += 200; -#. add_subwindow(new BC_Title(x, y, _("Strategy:"))); -#. popup = new PlaybackStrategy(this, x + 70, y); -#. popup->create_objects(); -#. x = 10; -#. y += popup->get_h() + 30; -#. Global playback options -#. All strategies use these #: cinelerra/audiooutprefs.C:59 cinelerra/playbackprefs.C:62 msgid "Audio Out" msgstr "Zvoèni izhod" @@ -601,8 +575,7 @@ msgstr "Programsko ugotavljaj trenutno mesto predvajanja" msgid "Audio playback in real time priority (root only)" msgstr "Predvajaj zvok z realno èasovno prioriteto (le administrator)" -#. printf("AWindowGUI::create_objects 1\n"); -#: cinelerra/awindowgui.C:270 plugins/titler/title.C:1024 +#: cinelerra/awindowgui.C:270 plugins/titler/title.C:1026 msgid "Title" msgstr "Naslov" @@ -881,7 +854,6 @@ msgstr "YUV420" msgid "YUV422" msgstr "YUV422" -#. printf("ConfirmQuitWindow::create_objects 1\n"); #: cinelerra/confirmquit.C:37 msgid "( Answering No will destroy changes )" msgstr "( Odgovor \"Ne\" bo unièil spremembe ) " @@ -1048,10 +1020,6 @@ msgstr "Na msgid "Value:" msgstr "Vrednost:" -#. add_subwindow(next_point = new CWindowMaskCycleNext(mwindow, this, x, y)); -#. y += 30; -#. add_subwindow(prev_point = new CWindowMaskCyclePrev(mwindow, this, x, y)); -#. y += 40; #: cinelerra/cwindowtool.C:1511 msgid "Mask number:" msgstr "©tevilka maske:" @@ -1217,25 +1185,25 @@ msgstr "Atributi:" msgid "Compressor: Consumer DV" msgstr "Kompresija: Consumer DV" -#: cinelerra/file.C:200 +#: cinelerra/file.C:425 msgid "This format doesn't support audio." msgstr "Ta format ne podpira zvoka." -#: cinelerra/file.C:203 +#: cinelerra/file.C:428 msgid "This format doesn't support video." msgstr "Ta format ne podpira videa." -#: cinelerra/file.C:1076 cinelerra/filemov.C:1030 cinelerra/loadmode.C:58 +#: cinelerra/file.C:1324 cinelerra/filemov.C:1030 cinelerra/loadmode.C:58 msgid "Unknown" msgstr "Neznan" -#: cinelerra/file.C:1132 cinelerra/file.C:1138 cinelerra/fileformat.C:143 -#: cinelerra/filesndfile.C:411 +#: cinelerra/file.C:1380 cinelerra/file.C:1386 cinelerra/fileformat.C:143 +#: cinelerra/filesndfile.C:414 cinelerra/filesndfile.C:866 msgid "Lo Hi" msgstr "Ni¾-Vi¹" -#: cinelerra/file.C:1139 cinelerra/fileformat.C:155 -#: cinelerra/filesndfile.C:396 +#: cinelerra/file.C:1387 cinelerra/fileformat.C:155 +#: cinelerra/filesndfile.C:399 cinelerra/filesndfile.C:851 msgid "Hi Lo" msgstr "Vi¹-Ni¾" @@ -1247,7 +1215,6 @@ msgstr "Apple/SGI AIFF" msgid "MPEG Audio" msgstr "Zvok MPEG" -#. For encoding only #: cinelerra/file.inc:49 msgid "Sun/NeXT AU" msgstr "Sun/NeXT AU" @@ -1288,7 +1255,6 @@ msgstr "Quicktime za Linux" msgid "MPEG" msgstr "MPEG" -#. For decoding only #: cinelerra/file.inc:60 msgid "Raw PCM" msgstr "Surov PCM" @@ -1321,7 +1287,6 @@ msgstr "Zaporedje TIFF" msgid "MPEG Video" msgstr "Video MPEG" -#. For encoding only #: cinelerra/file.inc:69 msgid "OGG Vorbis" msgstr "OGG Vorbis" @@ -1358,7 +1323,6 @@ msgstr "ADPCM" msgid "Float" msgstr "Plavajoèa vejica" -#. Video formats not part of Quicktime #: cinelerra/file.inc:116 msgid "RGB ALPHA" msgstr "RGB ALPHA" @@ -1470,7 +1434,6 @@ msgstr "MP3" msgid "FileMOV::open_file %s: No such file or directory\n" msgstr "FileMOV::open_file %s: Datoteka ali imenik ne obstaja\n" -#. Fix up the Quicktime file. #: cinelerra/filemov.C:239 msgid "Made with Cinelerra for Linux" msgstr "Narejeno s Cinellero za Linux" @@ -1479,8 +1442,8 @@ msgstr "Narejeno s Cinellero za Linux" msgid "Bits per channel:" msgstr "Bitov na kanal:" -#: cinelerra/filemov.C:1283 cinelerra/filesndfile.C:373 -#: cinelerra/formatwindow.C:176 +#: cinelerra/filemov.C:1283 cinelerra/filesndfile.C:376 +#: cinelerra/filesndfile.C:828 cinelerra/formatwindow.C:176 msgid "Dither" msgstr "Razpr¹evanje" @@ -1586,8 +1549,6 @@ msgstr "Derivat:" msgid "I frame distance:" msgstr "Razd. med slik. I:" -#. add_subwindow(new BC_Title(x, y, _("P frame distance:"))); -#. y += 30; #: cinelerra/filempeg.C:1028 msgid "Progressive frames" msgstr "Progresivne slike" @@ -1628,7 +1589,8 @@ msgstr "YUV 4:2:2" msgid "Use alpha" msgstr "Uporabi alfo" -#: cinelerra/filesndfile.C:377 cinelerra/formatwindow.C:188 +#: cinelerra/filesndfile.C:380 cinelerra/filesndfile.C:832 +#: cinelerra/formatwindow.C:188 msgid "Signed" msgstr "Predznaèen" @@ -1685,7 +1647,6 @@ msgstr "Izhod v datoteko" msgid "Select a file to write to:" msgstr "Izberi datoteko v katero naj se pi¹e:" -#. printf("FormatTools::create_objects 3\n"); #: cinelerra/formattools.C:114 msgid "File Format:" msgstr "Obl. zapisa:" @@ -1755,7 +1716,6 @@ msgstr "Ustvarjam %s." msgid "IndexFile::draw_index: index has 0 zoom\n" msgstr "IndexFile::draw_index: kazalo ima poveèavo 0\n" -#. failed to create it #: cinelerra/indexthread.C:205 #, c-format msgid "IndexThread::run() Couldn't write index file %s to disk.\n" @@ -1777,11 +1737,6 @@ msgstr "Vleci le izvor" msgid "No effect" msgstr "Brez uèinka" -#. add_border(get_resources()->get_bg_shadow1(), -#. get_resources()->get_bg_shadow2(), -#. get_resources()->get_bg_color(), -#. get_resources()->get_bg_light2(), -#. get_resources()->get_bg_light1()); #: cinelerra/interfaceprefs.C:40 cinelerra/preferencesthread.C:233 msgid "Interface" msgstr "Vmesnik" @@ -1993,7 +1948,6 @@ msgstr "Izpi msgid "Dump Assets" msgstr "Izpi¹i sredstva" -#. ================================================= edit #: cinelerra/mainmenu.C:540 msgid "Undo" msgstr "Razveljavi" @@ -2175,7 +2129,8 @@ msgid "Render effect..." msgstr "Upodobi uèinek..." #: cinelerra/menueffects.C:114 -msgid "No recorable tracks specified." +#, fuzzy +msgid "No recordable tracks specified." msgstr "Navedena ni nobena snemalna steza." #: cinelerra/menueffects.C:125 @@ -2194,7 +2149,6 @@ msgstr "Izbran ni noben u msgid "No selected range to process." msgstr "Ni izbranega obmoèja za procesiranje." -#. open failed #: cinelerra/menueffects.C:426 cinelerra/packagerenderer.C:172 #: cinelerra/savefile.C:85 #, c-format @@ -2420,7 +2374,6 @@ msgstr "zdru msgid "Clip %d\n" msgstr "Odsek %d\n" -#. printf("MWindow::toggle_label 1\n"); #: cinelerra/mwindowedit.C:1768 msgid "label" msgstr "oznaka" @@ -2457,11 +2410,6 @@ msgstr "Ri msgid "Don't send to output" msgstr "Ne po¹lji v izhod" -#. add_border(get_resources()->get_bg_shadow1(), -#. get_resources()->get_bg_shadow2(), -#. get_resources()->get_bg_color(), -#. get_resources()->get_bg_light2(), -#. get_resources()->get_bg_light1()); #: cinelerra/performanceprefs.C:47 cinelerra/preferencesthread.C:230 msgid "Performance" msgstr "Zmogljivost" @@ -2655,7 +2603,6 @@ msgstr "Avtor: %s" msgid "License: %s" msgstr "Licenca: %s" -#. printf("PluginArray::run_plugins 2\n"); #: cinelerra/pluginarray.C:166 #, c-format msgid "%s..." @@ -2728,11 +2675,6 @@ msgstr "odpni u msgid "Show" msgstr "Ka¾i" -#. add_border(get_resources()->get_bg_shadow1(), -#. get_resources()->get_bg_shadow2(), -#. get_resources()->get_bg_color(), -#. get_resources()->get_bg_light2(), -#. get_resources()->get_bg_light1()); #: cinelerra/pluginprefs.C:36 msgid "Plugin Set" msgstr "Nabor vtiènikov" @@ -2853,7 +2795,6 @@ msgstr "Prej msgid "Path:" msgstr "Pot:" -#. printf("RecordWindow::create_objects 1\n"); #: cinelerra/recordgui.C:260 cinelerra/recordwindow.C:47 msgid "Select a file to record to:" msgstr "Izberi datoteko za snemanje:" @@ -2962,7 +2903,7 @@ msgstr "Kon msgid "Rewind batch and overwrite?" msgstr "Previj paket in pi¹i preko?" -#: cinelerra/recordmonitor.C:471 cinelerra/vdeviceprefs.C:195 +#: cinelerra/recordmonitor.C:471 cinelerra/vdeviceprefs.C:197 msgid "Swap fields" msgstr "Zamenjaj polja" @@ -3023,7 +2964,6 @@ msgstr "" msgid "Record single frame" msgstr "Posnami eno samo sliko" -#. this->engine = engine; #: cinelerra/recordtransport.C:176 msgid "Preview recording" msgstr "Predogled snemanja" @@ -3056,7 +2996,6 @@ msgstr "Znova nari msgid "RenderFarmServerThread::start_loop: socket\n" msgstr "RenderFarmServerThread::start_loop: vtiè\n" -#. printf("RenderFarmServerThread::start_loop 4 %s\n", hostname); #: cinelerra/renderfarm.C:174 cinelerra/renderfarm.C:217 #, c-format msgid "RenderFarmServerThread::start_loop: %s: %s\n" @@ -3098,7 +3037,6 @@ msgstr "RenderFarmClient::main_loop: poslu msgid "RenderFarmClient::main_loop: accept" msgstr "RenderFarmClient::main_loop: sprejmi" -#. printf("RenderFarmClientThread::run 12\n"); #: cinelerra/renderfarmclient.C:562 msgid "RenderFarmClientThread::run: Session finished.\n" msgstr "RenderFarmClientThread::run: Seja zakljuèena.\n" @@ -3134,7 +3072,6 @@ msgstr "Ne morem kon msgid "Can't quit while a render is in progress." msgstr "Ne morem konèati dokler traja upodabljanje." -#. printf("Quit::run 2\n"); #: cinelerra/quit.C:87 msgid "Save edit list before exiting?" msgstr "Pred izhodom shrani seznam urejanj?" @@ -3160,7 +3097,6 @@ msgstr "\"%s\" %dC napisal" msgid "Save as..." msgstr "Shrani kot..." -#. update the project name #: cinelerra/savefile.C:192 plugins/reverb/reverb.C:397 #, c-format msgid "Couldn't open %s." @@ -3333,15 +3269,15 @@ msgstr "VDeviceLML::read_buffer: sesutje gonilnika\n" msgid "VDeviceLML::read_buffer: reopened\n" msgstr "VDeviceLML::read_buffer: znova odprt\n" -#: cinelerra/vdeviceprefs.C:200 +#: cinelerra/vdeviceprefs.C:202 msgid "Output channel:" msgstr "Izhodni kanal:" -#: cinelerra/vdeviceprefs.C:301 +#: cinelerra/vdeviceprefs.C:321 msgid "Display:" msgstr "Zaslon:" -#: cinelerra/vdeviceprefs.C:311 +#: cinelerra/vdeviceprefs.C:331 msgid "Display for compositor:" msgstr "Zaslon skladatelja:" @@ -3506,7 +3442,6 @@ msgstr "Ustvari novo mapo" msgid "Up a directory" msgstr "Imenik navzgor" -#. Need a temp so submit_file can expand it #: guicast/bcfilebox.C:379 msgid ".." msgstr ".." @@ -3748,12 +3683,10 @@ msgstr "Barvni klju msgid "Color Balance" msgstr "Barvno ravnovesje" -#. printf("ColorBalanceWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:45 msgid "Cyan" msgstr "Sinja" -#. printf("ColorWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:47 #: plugins/denoisevideo/denoisevideo.C:182 plugins/downsample/downsample.C:295 #: plugins/histogram/histogram.C:402 plugins/libcolors/colorpicker.C:145 @@ -3763,12 +3696,10 @@ msgstr "Sinja" msgid "Red" msgstr "Rdeèa" -#. printf("ColorBalanceWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:50 msgid "Magenta" msgstr "©krlatna" -#. printf("ColorWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:52 #: plugins/denoisevideo/denoisevideo.C:184 plugins/downsample/downsample.C:301 #: plugins/histogram/histogram.C:408 plugins/libcolors/colorpicker.C:151 @@ -3778,12 +3709,10 @@ msgstr " msgid "Green" msgstr "Zelena" -#. printf("ColorBalanceWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:55 msgid "Yellow" msgstr "Rumena" -#. printf("ColorWindow::create_objects 1\n"); #: plugins/colorbalance/colorbalancewindow.C:57 #: plugins/denoisevideo/denoisevideo.C:186 plugins/downsample/downsample.C:307 #: plugins/histogram/histogram.C:414 plugins/libcolors/colorpicker.C:157 @@ -4105,7 +4034,6 @@ msgstr "Zunanja barva" msgid "Gradient" msgstr "Preliv" -#. printf("ColorWindow::create_objects 1\n"); #: plugins/histogram/histogram.C:396 plugins/huesaturation/huewindow.C:62 #: plugins/libcolors/colorpicker.C:139 msgid "Value" @@ -4164,7 +4092,6 @@ msgstr "Odtenek in nasi msgid "Hue" msgstr "Odtenek" -#. printf("ColorWindow::create_objects 1\n"); #: plugins/huesaturation/huewindow.C:57 plugins/libcolors/colorpicker.C:133 msgid "Saturation" msgstr "Nasièenost" @@ -4634,18 +4561,18 @@ msgid "New/Open SVG..." msgstr "Nov/Odpri SVG..." #: plugins/svg/svgwin.C:234 -#, c-format +#, fuzzy, c-format msgid "" -"SVG Width is currently only supported in milimeters: %s, falling back to " +"SVG Width is currently only supported in millimeters: %s, falling back to " "100\n" msgstr "" "Navajanje SVG ¹irine je trenutno podprto le v milimetrih: %s, uporabljam " "vrednost 100\n" #: plugins/svg/svgwin.C:245 -#, c-format +#, fuzzy, c-format msgid "" -"SVG Height is currently only supported in milimeters: %s, falling back to " +"SVG Height is currently only supported in millimeters: %s, falling back to " "100\n" msgstr "" "Navajanje SVG vi¹ine je trenutno podprto le v milimetrih: %s, uporabljam " @@ -4723,7 +4650,6 @@ msgstr "Osnovna frekv.:" msgid "DC" msgstr "DC" -#. add_item(new SynthWaveFormItem(synth, _("DC"), DC)); #: plugins/synthesizer/synthesizer.C:747 #: plugins/synthesizer/synthesizer.C:1000 #: plugins/synthesizer/synthesizer.C:1289 @@ -4823,47 +4749,46 @@ msgstr "Del izvorne dol msgid "Time stretch" msgstr "Raztegnjen èas" -#: plugins/titler/title.C:60 +#: plugins/titler/title.C:62 msgid "hello world" msgstr "pozdravljen svet" -#: plugins/titler/title.C:269 +#: plugins/titler/title.C:271 msgid "GlyphUnit::process_package FT_New_Face failed.\n" msgstr "GlyphUnit::process_package FT_New_Face neuspe¹no.\n" -#: plugins/titler/title.C:288 +#: plugins/titler/title.C:290 #, c-format msgid "GlyphUnit::process_package FT_Load_Char failed - char: %i.\n" msgstr "GlyphUnit::process_package FT_Load_Char failed - znak: %i.\n" -#: plugins/titler/title.C:1327 +#: plugins/titler/title.C:1329 #, c-format msgid "TitleMain::load_freetype_face %s failed.\n" msgstr "TitleMain::load_freetype_face %s neuspe¹no.\n" -#. Something went wrong. -#: plugins/titler/title.C:1450 +#: plugins/titler/title.C:1452 #, c-format msgid "Iconv conversion from %s to Unicode UCS-4 not available\n" msgstr "Pretvorba znakov Iconv iz %s v Unicode UCS-4 ni na voljo\n" -#: plugins/titler/title.C:1897 +#: plugins/titler/title.C:1899 msgid "No motion" msgstr "Brez gibanja" -#: plugins/titler/title.C:1898 +#: plugins/titler/title.C:1900 msgid "Bottom to top" msgstr "Od spodaj navzgor" -#: plugins/titler/title.C:1899 +#: plugins/titler/title.C:1901 msgid "Top to bottom" msgstr "Od zgoraj navzdol" -#: plugins/titler/title.C:1900 +#: plugins/titler/title.C:1902 msgid "Right to left" msgstr "Od desne proti levi" -#: plugins/titler/title.C:1901 +#: plugins/titler/title.C:1903 msgid "Left to right" msgstr "Od leve proti desni" @@ -4987,13 +4912,6 @@ msgstr "Po msgid "Reflective" msgstr "Odbojen" -#. add_subwindow(new BC_Title(x, y, _("Mode:"))); -#. add_subwindow(smear = new WaveSmear(plugin, this, x1, y)); -#. y += 20; -#. add_subwindow(blacken = new WaveBlacken(plugin, this, x1, y)); -#. y += 30; -#. add_subwindow(reflective = new WaveReflective(plugin, x1, y)); -#. y += 30; #: plugins/wave/wave.C:403 msgid "Amplitude:" msgstr "Amplituda:" diff --git a/quicktime/Makefile.am b/quicktime/Makefile.am index 51e3c2d1..80f34c96 100644 --- a/quicktime/Makefile.am +++ b/quicktime/Makefile.am @@ -2,12 +2,14 @@ SUBDIRS=decore50 encore50 lib_LTLIBRARIES = libquicktime.la -libquicktime_la_CFLAGS = $(GLIB_CFLAGS) $(CPU_CFLAGS) $(FIREWIRE_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(LIBAVCODEC_CFLAGS) -Iencore50/ -Idecore50/ -DDECORE_INCLUDE=\"decore50/decore.h\" -DENCORE_INCLUDE=\"encore50/encore.h\" +libquicktime_la_CFLAGS = $(GLIB_CFLAGS) $(CPU_CFLAGS) $(FIREWIRE_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(LIBAVCODEC_CFLAGS) -DDECORE_INCLUDE=\"decore50/decore.h\" -DENCORE_INCLUDE=\"encore50/encore.h\" libquicktime_la_LDFLAGS = -version-info 1:0:0 -release 1.6.0 -Wl,--no-undefined -libquicktime_la_LIBADD = $(GLIB_LIBS) $(FIREWIRE_LDFLAGS) -ldv -lxvidcore -ljpeg -lpng \ - -logg -lvorbis -lvorbisenc -lmp3lame $(LIBAVCODEC_LIBS) \ - encore50/libencore.la decore50/libdecore.la \ - ../libmpeg3/libmpeg3.la -lpthread -lm + +libquicktime_la_LIBADD = $(FIREWIRE_LDFLAGS) -ldv -lxvidcore -ljpeg -lpng \ + -logg -lvorbis -lvorbisenc -lmp3lame $(LIBAVCODEC_LIBS) \ + encore50/libencore.la decore50/libdecore.la \ + $(top_builddir)/libmpeg3/libmpeg3.la -lpthread -lm + libquicktime_la_SOURCES = atom.c avi_hdrl.c avi_idx1.c avi_movi.c avi_strl.c \ avi_odml.c avi_ix.c avi_indx.c avi_riff.c \ cmodel_default.c cmodel_yuv420p.c cmodel_yuv422.c codecs.c colormodels.c \ @@ -19,9 +21,55 @@ libquicktime_la_SOURCES = atom.c avi_hdrl.c avi_idx1.c avi_movi.c avi_strl.c \ vorbis.c workarounds.c yuv2.c yuv4.c yv12.c wmx2.c \ wma.c mpeg4.c +noinst_HEADERS = cmodel_permutation.h \ + codecs.h \ + colormodels.h \ + div3.h \ + divx.h \ + dv.h \ + fastjpg.h \ + fastjpgmacro.h \ + funcprotos.h \ + graphics.h \ + ima4.h \ + jpeg.h \ + jpeg_old.h \ + libdv.h \ + libmjpeg.h \ + mmx.h \ + mpeg4.h \ + qtmp3.h \ + qtpng.h \ + qtprivate.h \ + qtvorbis.h \ + quicktime.h \ + raw.h \ + rawaudio.h \ + rtjpeg.h \ + rtjpeg_core.h \ + twos.h \ + ulaw.h \ + v308.h \ + v408.h \ + v410.h \ + wma.h \ + wmx1.h \ + wmx2.h \ + workarounds.h \ + xanimjpeg.h \ + yuv2.h \ + yuv4.h \ + yuv9.h \ + yv12.h + +EXTRA_DIST = docs + INCLUDES = -I/usr/include/lame -I$(top_srcdir)/libmpeg3 -I/usr/include/glib-1.2 pkgincludedir=$(includedir)/quicktime pkginclude_HEADERS=quicktime.h qtprivate.h LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) + +dist-hook: + -rm -rf $(distdir)/docs/CVS diff --git a/quicktime/decore50/Makefile.am b/quicktime/decore50/Makefile.am index 538e03e6..387caf9f 100644 --- a/quicktime/decore50/Makefile.am +++ b/quicktime/decore50/Makefile.am @@ -12,6 +12,28 @@ libdecore_la_SOURCES += basic_prediction.c endif INCLUDES=-I./ - +noinst_HEADERS = basic_prediction.h \ + clearblock.h \ + debug.h \ + decore.h \ + gen_draw.h \ + gen_usetime.h \ + getbits.h \ + global.h \ + idct.h \ + mp4_block.h \ + mp4_decoder.h \ + mp4_header.h \ + mp4_iquant.h \ + mp4_mblock.h \ + mp4_predict.h \ + mp4_vars.h \ + mp4_vld.h \ + portab.h \ + postprocess.h \ + store.h \ + timer.h \ + transferidct.h \ + yuv2rgb.h LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/quicktime/encore50/Makefile.am b/quicktime/encore50/Makefile.am index 17aed35d..2812385a 100644 --- a/quicktime/encore50/Makefile.am +++ b/quicktime/encore50/Makefile.am @@ -4,5 +4,30 @@ libencore_la_LDFLAGS = -static libencore_la_LIBADD = libencore_la_SOURCES = bitstream.c encore.c mom_access.c mom_util.c mot_code.c mot_est_comp.c mot_est_mb.c mot_util.c putvlc.c rate_ctl.c text_bits.c text_code.c text_code_mb.c text_dct.c vop_code.c +noinst_HEADERS = bitstream.h \ + encore.h \ + max_level.h \ + mom_access.h \ + mom_structs.h \ + mom_util.h \ + momusys.h \ + mot_code.h \ + mot_est_comp.h \ + mot_est_mb.h \ + mot_util.h \ + non_unix.h \ + putvlc.h \ + rate_ctl.h \ + text_bits.h \ + text_code.h \ + text_code_mb.h \ + text_dct.h \ + text_defs.h \ + vlc.h \ + vm_common_defs.h \ + vm_enc_defs.h \ + vop_code.h \ + zigzag.h + LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff --git a/toolame-02l/Makefile.am b/toolame-02l/Makefile.am index 3ff1c3ab..a7f284e8 100644 --- a/toolame-02l/Makefile.am +++ b/toolame-02l/Makefile.am @@ -22,6 +22,39 @@ libtoolame_la_SOURCES = common.c \ ath.c \ encode_new.c +noinst_HEADERS = absthr.h \ + ath.h \ + audio_read.h \ + availbits.h \ + bitstream.h \ + common.h \ + crc.h \ + critband.h \ + encode.h \ + encode_new.h \ + encoder.h \ + enwindow.h \ + fft.h \ + freqtable.h \ + ieeefloat.h \ + mem.h \ + musicin.h \ + options.h \ + portableio.h \ + psycho_0.h \ + psycho_1.h \ + psycho_1_priv.h \ + psycho_2.h \ + psycho_3.h \ + psycho_3priv.h \ + psycho_4.h \ + psycho_n1.h \ + subband.h \ + tables.h \ + toolame.h + +EXTRA_DIST = FUTURE HISTORY LGPL.txt pds_subband.c + libtoolame_la_CFLAGS = -fomit-frame-pointer -O3 -DNDEBUG -DINLINE=inline -DNEWENCODE -DNEWATAN libtoolame_la_LDFLAGS = -lm -- 2.11.4.GIT