X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fpage_status.c;h=5f6b66d335d8de923328378c01658d80f5b764cf;hb=af456e04d9e5686a032e534f8867187a08775286;hp=555a7666ca59c00eeca39f791e61dae16e8d488e;hpb=8df5e84b24ee6af0633a47521cd252eb7270b4e9;p=rugen diff --git a/src/page_status.c b/src/page_status.c index 555a766..5f6b66d 100644 --- a/src/page_status.c +++ b/src/page_status.c @@ -87,7 +87,6 @@ static int show_status( page_status this, mvcp_status status ) { GtkWidget *widget = this_page_get_widget( ( page )this ); char temp[ 1024 ] = ""; - char temp2[ 1024 ]; char label_name[ 256 ]; format_status_string(temp, sizeof(temp), status , "\n"); @@ -98,11 +97,22 @@ static int show_status( page_status this, mvcp_status status ) gtk_label_set_text( GTK_LABEL( widget ), temp ); if ( status->unit == dv1394app_get_selected_unit( this->app ) ) { - format_status_string(temp, sizeof(temp), status , " "); - sprintf( temp2, "U%d - %s", status->unit, temp ); + char tc1[12], tc2[12]; + + snprintf( temp, sizeof(temp), "U%d - [%s] %s", + status->unit, + status_to_text( status ), + status->clip); widget = lookup_widget( dv1394app_get_widget( this->app ), "statusbar" ); gtk_statusbar_pop( GTK_STATUSBAR( widget ), this->context ); - gtk_statusbar_push( GTK_STATUSBAR( widget ), this->context, temp2 ); + gtk_statusbar_push( GTK_STATUSBAR( widget ), this->context, temp ); + + widget = lookup_widget( dv1394app_get_widget( this->app ), "bbt_label_1a" ); + snprintf( temp, sizeof(temp), "%s / %s", + frames2tc(status->position, status->fps, tc1), + frames2tc(status->out - status->position, status->fps, tc2)); + gtk_label_set_text( GTK_LABEL( widget ), temp ); + dv1394app_show_status( this->app, status ); } gdk_flush();