X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fdv1394app.h;h=4a91a5fb4a5b2ae5e91ecdf9192d0f469cc4cdb7;hb=33a2dfad035026ca7d740c3fe25b7c15bdf6ceb6;hp=a008e4ee236b22312850542aad0b6a9c116904d7;hpb=4c1dc967fd477540e82566fff8d60e1c67ff3ca1;p=rugen

diff --git a/src/dv1394app.h b/src/dv1394app.h
index a008e4e..4a91a5f 100644
--- a/src/dv1394app.h
+++ b/src/dv1394app.h
@@ -1,6 +1,7 @@
 /*
  * dv1394app.h -- GTK+ 2 dv1394d client demo
  * Copyright (C) 2002-2003 Charles Yates <charles.yates@pandora.be>
+ * Copyright (C) 2010 Dan Dennedy <dan@dennedy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +22,9 @@
 #define _DV1394_APP_
 
 #include <gtk/gtk.h>
-#include <valerie/valerie.h>
+#include <mvcp/mvcp.h>
+
+#define TRANSPORT_BUTTONS_COUNT 13
 
 typedef struct page_t *page;
 	
@@ -29,34 +32,40 @@ typedef struct
 {
 	GtkWidget *window;
 	GtkWidget *connect;
-	valerie_parser parser;
-	valerie command;
+	mvcp_parser parser;
+	mvcp command;
 	int page_count;
 	GtkWidget *page_buttons[ 10 ];
 	page pages[ 10 ];
 	int selected_unit;
 	
 	// TODO: This comes out later
-	GtkWidget *buttons[ 12 ];
+	GtkWidget *buttons[ TRANSPORT_BUTTONS_COUNT ];
 	
 	int trim_in_use;
 	int seek_flag;
 	
 	int trim_in;
 	int trim_out;
+	int guard;
+	int eof[16];
+	char* playlist_folder;
+	GdkPixbuf *playing[2];
 }
 *dv1394app, dv1394app_t;
 
 extern dv1394app dv1394app_init( GtkWidget *, char * );
 extern GtkWidget *dv1394app_get_widget( dv1394app );
-extern valerie_parser dv1394app_get_parser( dv1394app );
-extern valerie dv1394app_get_command( dv1394app );
+extern mvcp_parser dv1394app_get_parser( dv1394app );
+extern mvcp dv1394app_get_command( dv1394app );
 extern void dv1394app_connect( dv1394app );
 extern void dv1394app_on_unit_change( dv1394app, int );
 extern int dv1394app_get_selected_unit( dv1394app );
-extern void dv1394app_show_status( dv1394app, valerie_status );
+extern void dv1394app_show_status( dv1394app, mvcp_status );
 extern void dv1394app_disconnect( dv1394app );
 extern void dv1394app_close( dv1394app );
 
+extern char* frames2tc( int f, float fps, char* buf );
+
 #endif