diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-04-28 22:29:36 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-04-28 22:29:36 +0000 |
| commit | f38fa74e306ea2bbd9b8f34521f6d441e1026e8b (patch) | |
| tree | c32aa08a0feaec5ac5dc1e5839597db304585796 /src | |
| parent | 3bb37d245783972277f94a8d33f5e6c99e567df9 (diff) | |
| download | xine-lib-f38fa74e306ea2bbd9b8f34521f6d441e1026e8b.tar.gz xine-lib-f38fa74e306ea2bbd9b8f34521f6d441e1026e8b.tar.bz2 | |
re-enabled video window code
CVS patchset: 42
CVS date: 2001/04/28 22:29:36
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/video_out_xv.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index ef32ae18e..17a94d1dd 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xv.c,v 1.7 2001/04/28 22:03:03 guenter Exp $ + * $Id: video_out_xv.c,v 1.8 2001/04/28 22:29:36 guenter Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -916,10 +916,10 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual) { * init window */ - /* + xv_calc_format (this, 720, 576, 2); xv_setup_window (this); - */ + return &this->vo_driver; } diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 124c377b8..1a6f5201c 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.14 2001/04/28 22:03:03 guenter Exp $ + * $Id: load_plugins.c,v 1.15 2001/04/28 22:29:36 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -379,7 +379,8 @@ char **xine_list_video_output_plugins (int visual_type) { /* FIXME: sort the list by vo_info->priority */ - plugin_ids[num_plugins] = vo_info->id; + plugin_ids[num_plugins] = (char *) malloc (strlen(vo_info->id)+1); + strcpy (plugin_ids[num_plugins], vo_info->id); num_plugins++; plugin_ids[num_plugins] = NULL; } @@ -388,6 +389,7 @@ char **xine_list_video_output_plugins (int visual_type) { printf("load_plugins: %s seems to be an invalid plugin (lacks get_video_out_plugin_info() function)\n", str); } + dlclose (plugin); } } } @@ -514,7 +516,8 @@ char **xine_list_audio_output_plugins() { /* FIXME: sort the list by ao_info->priority */ - plugin_ids[num_plugins] = ao_info->id; + plugin_ids[num_plugins] = (char *) malloc (strlen(ao_info->id)+1); + strcpy (plugin_ids[num_plugins], ao_info->id); num_plugins++; plugin_ids[num_plugins] = NULL; } @@ -523,6 +526,7 @@ char **xine_list_audio_output_plugins() { printf("load_plugins: %s seems to be an invalid plugin (lacks get_audio_out_plugin_info() function)\n", str); } + dlclose (plugin); } } } |