X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fpage_clips.c;h=aeefc741e6034cc00ee314b211abdc709aacb51c;hb=348abadd910a29af82380c3b896f4eb4b2467483;hp=d4251c6606177b24276d167ff4931bb15a674cd6;hpb=a5fd42fcba5ce6d680f44c5c8e01c44deae91ed2;p=rugen

diff --git a/src/page_clips.c b/src/page_clips.c
index d4251c6..aeefc74 100644
--- a/src/page_clips.c
+++ b/src/page_clips.c
@@ -47,6 +47,8 @@ typedef struct
 	// TODO: This comes out later
 	int mode;
 	GtkWidget *modes[ 4 ];
+
+	struct page_t *parent_page;
 }
 *page_clips, page_clips_t;
 
@@ -155,7 +157,13 @@ static void list_queue( page_clips this, int clip )
 		GtkCellRenderer *renderer;
 		GtkTreeViewColumn *column;
 
-		list_store = gtk_list_store_new( 6, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT );
+		list_store = gtk_list_store_new( 6,
+			G_TYPE_BOOLEAN,
+			G_TYPE_STRING,
+			G_TYPE_STRING,
+			G_TYPE_STRING,
+			G_TYPE_STRING,
+			G_TYPE_INT );
 		gtk_tree_view_set_model( GTK_TREE_VIEW( treeview ), GTK_TREE_MODEL( list_store ) );
 		
 		renderer = gtk_cell_renderer_toggle_new( );
@@ -188,9 +196,17 @@ static void list_queue( page_clips this, int clip )
 	
 	for ( index = 0; index < mvcp_list_count( list ); index ++ )
 	{
+		char tc1[12], tc2[12], tc3[12];
 		mvcp_list_get( list, index, &entry );
 		gtk_list_store_append( list_store, &iter );
-		gtk_list_store_set( list_store, &iter, 0, index == clip, 1, ( int )entry.in, 2, ( int )entry.out, 3, ( int )entry.size, 4, entry.full, 5, entry.clip, -1 );
+		gtk_list_store_set( list_store, &iter,
+			0, index == clip,
+			1, frames2tc( entry.in, entry.fps, tc1),
+			2, frames2tc( entry.out, entry.fps, tc2),
+			3, frames2tc( entry.size, entry.fps, tc3),
+			4, entry.full,
+			5, entry.clip,
+			-1 );
 	}
 
 	this->clip = clip;
@@ -262,8 +278,20 @@ static gboolean on_ok( GtkWidget *dummy, gpointer data )
 					mvcp_unit_append( this->dv, dv1394app_get_selected_unit( this->app ), temp, -1, -1 );
 					break;
 				case 3:
-					mvcp_unit_clip_insert( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_relative, 1, temp, -1, -1 );
+				{
+					GtkWidget *widget = lookup_widget( this_page_get_widget( this ), "treeview1" );
+					GtkTreeSelection *select = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
+					GtkTreeModel *model;
+					GtkTreeIter iter;
+					int clip;
+					
+					if ( gtk_tree_selection_get_selected( select, &model, &iter ) )
+					{
+						gtk_tree_model_get( model, &iter, 5, &clip,	-1 );
+						mvcp_unit_clip_insert( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip, temp, -1, -1 );
+					}
 					break;
+				}
 			}
 			
 			free( temp );
@@ -392,21 +420,51 @@ static gboolean on_refresh( GtkWidget *button, gpointer data )
 static gboolean on_up( GtkWidget *dummy, gpointer data )
 {
 	page_clips this = data;
-	mvcp_unit_clip_move( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_relative, 0, mvcp_relative, -1 );
+	GtkWidget *widget = lookup_widget( this_page_get_widget( this ), "treeview1" );
+	GtkTreeSelection *select = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	int clip;
+
+	if ( gtk_tree_selection_get_selected( select, &model, &iter ) )
+	{
+		gtk_tree_model_get( model, &iter, 5, &clip,	-1 );
+		mvcp_unit_clip_move( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip, mvcp_absolute, clip - 1 < 0 ? 0 : clip - 1 );
+	}
 	return TRUE;
 }
 
 static gboolean on_down( GtkWidget *dummy, gpointer data )
 {
 	page_clips this = data;
-	mvcp_unit_clip_move( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_relative, 0, mvcp_relative, 1 );
+	GtkWidget *widget = lookup_widget( this_page_get_widget( this ), "treeview1" );
+	GtkTreeSelection *select = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	int clip;
+
+	if ( gtk_tree_selection_get_selected( select, &model, &iter ) )
+	{
+		gtk_tree_model_get( model, &iter, 5, &clip,	-1 );
+		mvcp_unit_clip_move( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip, mvcp_absolute, clip + 1 );
+	}
 	return TRUE;
 }
 
 static gboolean on_remove( GtkWidget *dummy, gpointer data )
 {
 	page_clips this = data;
-	mvcp_unit_remove_current_clip( this->dv, dv1394app_get_selected_unit( this->app ) );
+	GtkWidget *widget = lookup_widget( this_page_get_widget( this ), "treeview1" );
+	GtkTreeSelection *select = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	int clip;
+
+	if ( gtk_tree_selection_get_selected( select, &model, &iter ) )
+	{
+		gtk_tree_model_get( model, &iter, 5, &clip,	-1 );
+		mvcp_unit_clip_remove( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip );
+	}
 	return TRUE;
 }
 
@@ -432,7 +490,7 @@ void on_mode_change( GtkMenuItem *menuitem, gpointer data )
 static GtkWidget *this_page_get_widget( page_clips this )
 {
 	if ( this->widget == NULL )
-		this->widget = create_page_clips( );
+		this->widget = this->parent_page->get_widget(this->parent_page);
 	return this->widget;
 }
 
@@ -477,12 +535,13 @@ static void this_page_close( page_clips this )
 		free( this );
 }
 
-page page_clips_init( dv1394app app )
+page page_clips_init( dv1394app app, struct page_t *parent_page)
 {
 	page_clips this = calloc( 1, sizeof( page_clips_t ) );
 	GtkWidget *widget;
 	int index = 0;
 
+	this->parent_page = parent_page;
 	this->parent.get_widget = ( GtkWidget *(*)( page ) )this_page_get_widget;
 	this->parent.get_toolbar_info = this_page_get_toolbar_info;
 	this->parent.on_connect = ( void (*)( page ) )this_page_on_connect;