summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_directx.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out/video_out_directx.c')
-rw-r--r--[-rwxr-xr-x]src/video_out/video_out_directx.c33
1 files changed, 8 insertions, 25 deletions
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index 7c3e5a78c..c2b3aa101 100755..100644
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -15,12 +15,10 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* video_out_directx.c, direct draw video output plugin for xine
* by Matthew Grooms <elon@altavista.com>
- *
- * $Id: video_out_directx.c,v 1.31 2006/07/10 22:08:44 dgp85 Exp $
*/
typedef unsigned char boolean;
@@ -37,10 +35,10 @@ typedef unsigned char boolean;
*/
#include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
#include "yuv2rgb.h"
#define NEW_YUV 1
@@ -1229,21 +1227,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi
return ( vo_driver_t * ) win32_driver;
}
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "DirectX";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin for win32 using directx");
-}
-
-static void dispose_class (video_driver_class_t *this_gen) {
- directx_class_t *directx = (directx_class_t *) this_gen;
-
- free (directx);
-}
-
static void *init_class (xine_t *xine, void *visual_gen) {
directx_class_t *directx;
@@ -1254,9 +1237,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
directx = (directx_class_t *) xine_xmalloc (sizeof (directx_class_t));
directx->driver_class.open_plugin = open_plugin;
- directx->driver_class.get_identifier = get_identifier;
- directx->driver_class.get_description = get_description;
- directx->driver_class.dispose = dispose_class;
+ directx->driver_class.identifier = "DirectX";
+ directx->driver_class.description = N_("xine video output plugin for win32 using directx");
+ directx->driver_class.dispose = default_video_driver_class_dispose;
directx->xine = xine;
directx->config = xine->config;
@@ -1275,6 +1258,6 @@ static const vo_info_t vo_info_win32 = {
const plugin_info_t xine_plugin_info[] EXPORTED = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 21, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class },
+ { PLUGIN_VIDEO_OUT, 22, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};