X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fpage_clips.c;h=6a85d82264d930fe371d11a514e6f4acbf9d9396;hb=53125cf7f5524730c9830ea33e36aa63eb1019cf;hp=eb7a088816189a14e6a89f7c61f20642b50ece20;hpb=cd30c23dffcec5d6abc2241573b199f45b6038a1;p=rugen

diff --git a/src/page_clips.c b/src/page_clips.c
index eb7a088..6a85d82 100644
--- a/src/page_clips.c
+++ b/src/page_clips.c
@@ -43,10 +43,6 @@ typedef struct
 	int unit;
 	int generation;
 	int clip;
-	
-	// TODO: This comes out later
-	int mode;
-	GtkWidget *modes[ 4 ];
 
 	struct page_t *parent_page;
 }
@@ -266,35 +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:
-				{
-					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;
-				}
-			}
-			
+			mvcp_unit_append( this->dv, dv1394app_get_selected_unit( this->app ), temp, -1, -1 );
 			free( temp );
 		}
 			
@@ -352,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;
@@ -476,18 +444,6 @@ 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 )
@@ -540,7 +496,6 @@ 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;
@@ -579,14 +534,5 @@ page page_clips_init( dv1394app app, struct page_t *parent_page)
 	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;
 }