fixes for prefs wrt compiler flags, correct comments

diff --git a/cinelerra-5.1/cinelerra/adeviceprefs.C b/cinelerra-5.1/cinelerra/adeviceprefs.C
index f3a108930da731d68e718da9c59bf8a7d7d80554..cff01da035b300cd20338cb605cc06f1b22125d9 100644 (file)
--- a/cinelerra-5.1/cinelerra/adeviceprefs.C
+++ b/cinelerra-5.1/cinelerra/adeviceprefs.C
@@ -615,22 +615,32 @@ ADriverMenu::~ADriverMenu()
 
 void ADriverMenu::create_objects()
 {
+#ifdef HAVE_OSS
        add_item(new ADriverItem(this, AUDIO_OSS_TITLE, AUDIO_OSS));
        add_item(new ADriverItem(this, AUDIO_OSS_ENVY24_TITLE, AUDIO_OSS_ENVY24));
+#endif
 
 #ifdef HAVE_ALSA
        add_item(new ADriverItem(this, AUDIO_ALSA_TITLE, AUDIO_ALSA));
 #endif
 
+#ifdef HAVE_ESOUND
        if(!do_input) add_item(new ADriverItem(this, AUDIO_ESOUND_TITLE, AUDIO_ESOUND));
-//     add_item(new ADriverItem(this, AUDIO_NAS_TITLE, AUDIO_NAS));
+#endif
+
 #ifdef HAVE_FIREWIRE
        if(!do_input) add_item(new ADriverItem(this, AUDIO_1394_TITLE, AUDIO_1394));
        add_item(new ADriverItem(this, AUDIO_DV1394_TITLE, AUDIO_DV1394));
        add_item(new ADriverItem(this, AUDIO_IEC61883_TITLE, AUDIO_IEC61883));
 #endif
+
+#ifdef HAVE_DVB
        if(do_input) add_item(new ADriverItem(this, AUDIO_DVB_TITLE, AUDIO_DVB));
+#endif
+
+#ifdef HAVE_VIDEO4LINUX2
        if(do_input) add_item(new ADriverItem(this, AUDIO_V4L2MPEG_TITLE, AUDIO_V4L2MPEG));
+#endif
 }
 
 char* ADriverMenu::adriver_to_string(int driver)

diff --git a/cinelerra-5.1/cinelerra/audioesound.C b/cinelerra-5.1/cinelerra/audioesound.C
index f5a9dd0de159756864a1f827c21c0f16f0610c17..b5f0ecd52d85b8a3babbdb7c9c94f481a85a777a 100644 (file)
--- a/cinelerra-5.1/cinelerra/audioesound.C
+++ b/cinelerra-5.1/cinelerra/audioesound.C
@@ -152,7 +152,7 @@ int AudioESound::read_buffer(char *buffer, int size)
 
 int AudioESound::write_buffer(char *buffer, int size)
 {
-       return esd_out_fd>0 ? write(esd_out_fd, buffer, size) : 0;
+       return esd_out_fd>0 && write(esd_out_fd, buffer, size) > 0 ? 0 : -1;
 }
 
 // No flushing in ESD

diff --git a/cinelerra-5.1/cinelerra/overlayframe.h b/cinelerra-5.1/cinelerra/overlayframe.h
index 730be3741ed638b54703c530809aeaada999e20e..620f8e18e8f1ff18cb2160c07db42d4119b82893 100644 (file)
--- a/cinelerra-5.1/cinelerra/overlayframe.h
+++ b/cinelerra-5.1/cinelerra/overlayframe.h
@@ -151,7 +151,7 @@
 #define COLOR_SRC_OVER(mx, Sc, Sa, Dc, Da) (Sc + Dc * (mx - Sa) / mx)
 #define CHROMA_SRC_OVER COLOR_SRC_OVER
 
-// AND         [Sa + Da - Sa * Da, Sc * Dc]
+// AND         [Sa * Da, Sc * Dc]
 #define ALPHA_AND(mx, Sa, Da) ((Sa * Da) / mx)
 #define COLOR_AND(mx, Sc, Sa, Dc, Da) ((Sc * Dc) / mx)
 #define CHROMA_AND COLOR_AND
@@ -161,7 +161,7 @@
 #define COLOR_OR(mx, Sc, Sa, Dc, Da) (Sc + Dc - (Sc * Dc) / mx)
 #define CHROMA_OR COLOR_OR
 
-// XOR         [Sa * (1 - Da) + Da * (1 - Sa), Sa + Da - 2 * Sa * Da]
+// XOR         [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + Dc * (1 - Sa)]
 #define ALPHA_XOR(mx, Sa, Da) (Sa + Da - (TWO * Sa * Da / mx))
 #define COLOR_XOR(mx, Sc, Sa, Dc, Da) ((Sc * (mx - Da) + Dc * (mx - Sa)) / mx)
 #define CHROMA_XOR COLOR_XOR
@@ -214,7 +214,7 @@
 #define CHROMA_SOFTLIGHT COLOR_SOFTLIGHT
 
 // DIFFERENCE [Sa + Da - Sa * Da,  Sc*(1 - Da) + Dc*(1 - Sa) +
-//  abs(Sc * Da - Sc * Sa)]
+//  abs(Sc * Da - Dc * Sa)]
 #define ALPHA_DIFFERENCE STD_ALPHA
 #define COLOR_DIFFERENCE(mx, Sc, Sa, Dc, Da) (STD_BLEND(mx,Sc,Sa,Dc,Da) + \
   (mabs(Sc * Da - Dc * Sa) / mx))

diff --git a/cinelerra-5.1/cinelerra/vdeviceprefs.C b/cinelerra-5.1/cinelerra/vdeviceprefs.C
index ac396dc04774e35c0d8be9c88366a9781206f484..a64ca40d056a83ac1297285057d13306e279131b 100644 (file)
--- a/cinelerra-5.1/cinelerra/vdeviceprefs.C
+++ b/cinelerra-5.1/cinelerra/vdeviceprefs.C
@@ -604,7 +604,9 @@ void VDriverMenu::create_objects()
                add_item(new VDriverItem(this, CAPTURE_FIREWIRE_TITLE, CAPTURE_FIREWIRE));
                add_item(new VDriverItem(this, CAPTURE_IEC61883_TITLE, CAPTURE_IEC61883));
 #endif
+#ifdef HAVE_DVB
                add_item(new VDriverItem(this, CAPTURE_DVB_TITLE, CAPTURE_DVB));
+#endif
        }
        else
        {