new growl plugin: local only, supports album art (you'll need the Growl Framework)

[vlc] / modules / access / v4l2 / v4l2.c

diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index 34ca69e0d93832676f9d30c1fcd9493d9e42b3ec..4ce3d0d136a4ca384a0e790415b099ff9557e69f 100644 (file)
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -38,6 +38,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
@@ -275,60 +279,43 @@ vlc_module_begin();
     set_section( N_( "Video input" ), NULL );
     add_string( CFG_PREFIX "dev", "/dev/video0", 0, DEV_TEXT, DEV_LONGTEXT,
                 VLC_FALSE );
-        change_safe();
     add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT,
                  STANDARD_LONGTEXT, VLC_FALSE );
-        change_safe();
         change_integer_list( i_standards_list, psz_standards_list_text, 0 );
     add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT,
                 VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-input", 0, NULL, AUDIO_INPUT_TEXT,
                  AUDIO_INPUT_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "io", IO_METHOD_MMAP, NULL, IOMETHOD_TEXT,
                  IOMETHOD_LONGTEXT, VLC_TRUE );
-        change_safe();
         change_integer_list( i_iomethod_list, psz_iomethod_list_text, 0 );
     add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
                 WIDTH_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
                 HEIGHT_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     set_section( N_( "Audio input" ), NULL );
     add_string( CFG_PREFIX "adev", NULL, 0, ADEV_TEXT, ADEV_LONGTEXT,
                 VLC_FALSE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-method", AUDIO_METHOD_OSS|AUDIO_METHOD_ALSA,
                  NULL, AUDIO_METHOD_TEXT, AUDIO_METHOD_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_bool( CFG_PREFIX "stereo", VLC_TRUE, NULL, STEREO_TEXT, STEREO_LONGTEXT,
                 VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT,
                 SAMPLERATE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
                 CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     set_section( N_( "Tuner" ), NULL );
     add_integer( CFG_PREFIX "tuner", 0, NULL, TUNER_TEXT, TUNER_LONGTEXT,
                  VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "tuner-frequency", -1, NULL, FREQUENCY_TEXT,
                  FREQUENCY_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "tuner-audio-mode", -1, NULL, TUNER_AUDIO_MODE_TEXT,
                  TUNER_AUDIO_MODE_LONGTEXT, VLC_TRUE );
-        change_safe();
         change_integer_list( i_tuner_audio_modes_list,
                              psz_tuner_audio_modes_list_text, 0 );
 
@@ -336,79 +323,54 @@ vlc_module_begin();
                  N_( "v4l2 driver controls, if supported by your v4l2 driver." ) );
     add_bool( CFG_PREFIX "controls-reset", VLC_FALSE, NULL, CTRL_RESET_TEXT,
               CTRL_RESET_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "brightness", -1, NULL, BRIGHTNESS_TEXT,
                  BRIGHTNESS_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "contrast", -1, NULL, CONTRAST_TEXT,
                  CONTRAST_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "saturation", -1, NULL, SATURATION_TEXT,
                  SATURATION_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "hue", -1, NULL, HUE_TEXT,
                  HUE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "black-level", -1, NULL, BLACKLEVEL_TEXT,
                  BLACKLEVEL_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "auto-white-balance", -1, NULL,
                  AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "do-white-balance", -1, NULL, DOWHITEBALANCE_TEXT,
                  DOWHITEBALANCE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "red-balance", -1, NULL, REDBALANCE_TEXT,
                  REDBALANCE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "blue-balance", -1, NULL, BLUEBALANCE_TEXT,
                  BLUEBALANCE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "gamma", -1, NULL, GAMMA_TEXT,
                  GAMMA_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "exposure", -1, NULL, EXPOSURE_TEXT,
                  EXPOSURE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "autogain", -1, NULL, AUTOGAIN_TEXT,
                  AUTOGAIN_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "gain", -1, NULL, GAIN_TEXT,
                  GAIN_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "hflip", -1, NULL, HFLIP_TEXT,
                  HFLIP_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "vflip", -1, NULL, VFLIP_TEXT,
                  VFLIP_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "hcenter", -1, NULL, HCENTER_TEXT,
                  HCENTER_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "vcenter", -1, NULL, VCENTER_TEXT,
                  VCENTER_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-volume", -1, NULL, AUDIO_VOLUME_TEXT,
                 AUDIO_VOLUME_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-balance", -1, NULL, AUDIO_BALANCE_TEXT,
                 AUDIO_BALANCE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_bool( CFG_PREFIX "audio-mute", VLC_FALSE, NULL, AUDIO_MUTE_TEXT,
               AUDIO_MUTE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-bass", -1, NULL, AUDIO_BASS_TEXT,
                 AUDIO_BASS_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-treble", -1, NULL, AUDIO_TREBLE_TEXT,
                 AUDIO_TREBLE_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( CFG_PREFIX "audio-loudness", -1, NULL, AUDIO_LOUDNESS_TEXT,
                 AUDIO_LOUDNESS_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT,
               S_CTRLS_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     add_shortcut( "v4l2" );
     set_capability( "access_demux", 10 );
@@ -553,7 +515,6 @@ struct buffer_t
 {
     void *  start;
     size_t  length;
-    void *  orig_userp;
 };
 
 struct demux_sys_t
@@ -1166,7 +1127,7 @@ static void DemuxClose( vlc_object_t *p_this )
         case IO_METHOD_USERPTR:
             for( i = 0; i < p_sys->i_nbuffers; ++i )
             {
-               free( p_sys->p_buffers[i].orig_userp );
+               free( p_sys->p_buffers[i].start );
             }
             break;
         }
@@ -1794,7 +1755,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
     struct v4l2_requestbuffers req;
     unsigned int i_page_size;
 
-    i_page_size = getpagesize();
+    i_page_size = sysconf(_SC_PAGESIZE);
     i_buffer_size = ( i_buffer_size + i_page_size - 1 ) & ~( i_page_size - 1);
 
     memset( &req, 0, sizeof(req) );
@@ -1818,8 +1779,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
     for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < 4; ++p_sys->i_nbuffers )
     {
         p_sys->p_buffers[p_sys->i_nbuffers].length = i_buffer_size;
-        p_sys->p_buffers[p_sys->i_nbuffers].start =
-            vlc_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].orig_userp,
+        posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start,
                 /* boundary */ i_page_size, i_buffer_size );
 
         if( !p_sys->p_buffers[p_sys->i_nbuffers].start )