Move more shared Xv config desc. & help strings; add new location to POTFILES.

(Transplanted from 574fefcee8b1b6456fd8dc9c06191cf4622f07eb)

4 files changed, 14 insertions, 12 deletions

diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 49271b9c8..eb2058590 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1382,8 +1382,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 
   adaptor_it = xcb_xv_query_adaptors_info_iterator(query_adaptors_reply);
   xv_port = config->register_num (config, "video.device.xv_port", 0,
-				  _("Xv port number"),
-				  _("Selects the Xv port number to use (0 to autodetect)."),
+				  VIDEO_DEVICE_XV_PORT_HELP,
 				  10, NULL, NULL);
 
   if (xv_port != 0) {
@@ -1579,8 +1578,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 
   this->use_pitch_alignment = 
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
-			   _("pitch alignment workaround"),
-			   _("Some buggy video drivers need a workaround to function properly."),
+			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xv_update_xv_pitch_alignment, this);
 
   this->deinterlace_method = 
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 7996fc3f6..886d30812 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1418,8 +1418,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
   }
 
   xv_port = config->register_num (config, "video.device.xv_port", 0,
-				  _("Xv port number"),
-				  _("Selects the Xv port number to use (0 to autodetect)."),
+				  VIDEO_DEVICE_XV_PORT_HELP,
 				  10, NULL, NULL);
 
   if (xv_port != 0) {
@@ -1637,8 +1636,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
 
   this->use_pitch_alignment = 
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
-			   _("pitch alignment workaround"),
-			   _("Some buggy video drivers need a workaround to function properly."),
+			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xv_update_xv_pitch_alignment, this);
 
   this->deinterlace_method = 
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index fa4be530d..f3404b067 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2442,8 +2442,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   }
 
   xv_port = config->register_num (config, "video.device.xv_port", 0,
-				  _("Xv port number"),
-				  _("Selects the Xv port number to use (0 to autodetect)."),
+				  VIDEO_DEVICE_XV_PORT_HELP,
 				  10, NULL, NULL);
 
   if (xv_port != 0) {
@@ -2654,8 +2653,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 
   this->use_pitch_alignment = 
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
-			   _("pitch alignment workaround"),
-			   _("Some buggy video drivers need a workaround to function properly."),
+			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xxmc_update_xv_pitch_alignment, this);
 
   use_more_frames= 
diff --git a/src/video_out/xv_common.h b/src/video_out/xv_common.h
index 71eecddad..ee2ab9a10 100644
--- a/src/video_out/xv_common.h
+++ b/src/video_out/xv_common.h
@@ -48,3 +48,11 @@
 	  "image to the repainting of the entire screen (\"vertical " \
 	  "retrace\"). This eliminates flickering and tearing artifacts, " \
 	  "but will use more graphics memory.")
+
+#define VIDEO_DEVICE_XV_PORT_HELP \
+	_("Xv port number"), \
+	_("Selects the Xv port number to use (0 to autodetect).")
+
+#define VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP \
+	_("pitch alignment workaround"), \
+	_("Some buggy video drivers need a workaround to function properly.")