X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fpage_clips.c;h=6a85d82264d930fe371d11a514e6f4acbf9d9396;hb=53125cf7f5524730c9830ea33e36aa63eb1019cf;hp=d4251c6606177b24276d167ff4931bb15a674cd6;hpb=a5fd42fcba5ce6d680f44c5c8e01c44deae91ed2;p=rugen diff --git a/src/page_clips.c b/src/page_clips.c index d4251c6..6a85d82 100644 --- a/src/page_clips.c +++ b/src/page_clips.c @@ -43,10 +43,8 @@ typedef struct int unit; int generation; int clip; - - // TODO: This comes out later - int mode; - GtkWidget *modes[ 4 ]; + + struct page_t *parent_page; } *page_clips, page_clips_t; @@ -155,42 +153,57 @@ 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( ); column = gtk_tree_view_column_new_with_attributes ( "", renderer, "active", 0, NULL); - gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); - + gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); + renderer = gtk_cell_renderer_text_new( ); - column = gtk_tree_view_column_new_with_attributes ( "In", renderer, "text", 1, NULL); + column = gtk_tree_view_column_new_with_attributes ( "Clip", renderer, "text", 1, NULL); gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); - + renderer = gtk_cell_renderer_text_new( ); - column = gtk_tree_view_column_new_with_attributes ( "Out", renderer, "text", 2, NULL); + column = gtk_tree_view_column_new_with_attributes ( "In", renderer, "text", 2, NULL); gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); - + renderer = gtk_cell_renderer_text_new( ); - column = gtk_tree_view_column_new_with_attributes ( "Length", renderer, "text", 3, NULL); + column = gtk_tree_view_column_new_with_attributes ( "Out", renderer, "text", 3, NULL); gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); - + renderer = gtk_cell_renderer_text_new( ); - column = gtk_tree_view_column_new_with_attributes ( "Clip", renderer, "text", 4, NULL); + column = gtk_tree_view_column_new_with_attributes ( "Length", renderer, "text", 4, NULL); gtk_tree_view_append_column( GTK_TREE_VIEW( treeview ), column ); + } else { list_store = GTK_LIST_STORE( gtk_tree_view_get_model( GTK_TREE_VIEW( treeview ) ) ); gtk_list_store_clear( list_store ); } - + this->generation = list->generation; - + 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, entry.full, + 2, frames2tc( entry.in, entry.fps, tc1), + 3, frames2tc( entry.out, entry.fps, tc2), + 4, frames2tc( entry.size, entry.fps, tc3), + 5, entry.clip, + -1 ); } this->clip = clip; @@ -200,7 +213,7 @@ static void list_queue( page_clips this, int clip ) gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW( treeview ), path, NULL, TRUE, 0.5, 0 ); gtk_tree_path_free( path ); } - + mvcp_list_close( list ); } @@ -249,23 +262,7 @@ static gboolean on_ok( GtkWidget *dummy, gpointer data ) char *temp = malloc( strlen( this->path ) + strlen( text ) + 1 ); strcpy( temp, this->path ); strcat( temp, text ); - switch( this->mode ) - { - case 0: - mvcp_unit_load_back( this->dv, dv1394app_get_selected_unit( this->app ), temp ); - mvcp_unit_play( this->dv, dv1394app_get_selected_unit( this->app ) ); - break; - case 1: - mvcp_unit_load( this->dv, dv1394app_get_selected_unit( this->app ), temp ); - break; - case 2: - 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 ); - break; - } - + mvcp_unit_append( this->dv, dv1394app_get_selected_unit( this->app ), temp, -1, -1 ); free( temp ); } @@ -323,8 +320,8 @@ static gboolean on_queue_item( GtkWidget *dummy, gpointer data ) if ( gtk_tree_selection_get_selected( select, &model, &iter ) ) { gtk_tree_model_get( model, &iter, 5, &clip, -1 ); + mvcp_unit_pause( this->dv, dv1394app_get_selected_unit( this->app ) ); mvcp_unit_clip_goto( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip, 0 ); - mvcp_unit_play( this->dv, dv1394app_get_selected_unit( this->app ) ); } return TRUE; @@ -392,21 +389,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; } @@ -417,22 +444,10 @@ static gboolean on_clean( GtkWidget *dummy, gpointer data ) return TRUE; } -void on_mode_change( GtkMenuItem *menuitem, gpointer data ) -{ - page_clips this = data; - int index = 0; - - for ( index = 0; index < 4; index ++ ) - if ( GTK_WIDGET( menuitem ) == this->modes[ index ] ) - break; - - this->mode = index; -} - 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 +492,12 @@ 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; @@ -519,14 +534,5 @@ page page_clips_init( dv1394app app ) g_signal_connect( G_OBJECT( widget ), "button-press-event", G_CALLBACK( on_queue_selected ), this ); g_signal_connect( G_OBJECT( widget ), "key-press-event", G_CALLBACK( on_queue_key_press ), this ); - for ( index = 0; index < 4; index ++ ) - { - char item[ 256 ]; - sprintf( item, "mode_%d", index ); - widget = lookup_widget( this_page_get_widget( this ), item ); - gtk_signal_connect( GTK_OBJECT( widget ), "activate", GTK_SIGNAL_FUNC( on_mode_change ), this ); - this->modes[ index ] = widget; - } - return ( page )this; }