← Back to branch summary

~andrewsomething/imagination/debian

« back to all changes in this revision

Viewing changes to src/slideshow_project.c

  • Committer: Andrew Starr-Bochicchio
  • Date: 2009-10-20 00:11:10 UTC
  • mfrom: (1.1.3)
  • Revision ID: a.starr.b@gmail.com-20091020001110-4n2wp5ntluojqw2x
Tags: 2.1-1
http://bugs.debian.org/551120
* New upstream release. (Closes: #551120)
* Split arch independent files into new binary, imagination-common.
 - Rename debian/imagination.doc-base to debian/imagination-common.doc-base
 - Add debian/imagination-common.install and debian/imagination.install
 - debian/control:
  + Add new binary, imagination-common.
  + Add depends on imagination-common (= ${source:Version})
  + Make imagination-common Conflict/Replace imagination (<= 2.0-1)
 - debian/rules:
  + Fill binary-indep target.
  + Install to debian/tmp/
* debian/patches:
 - 10_link_math_lib.patch: Adjust for new release.
 - 15_PLUGINS_INSTALLED.patch: New patch, correctly load transitions. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/slideshow_project.c
57
57
                gtk_tree_model_get(model, &iter,1,&entry,-1);
58
58
                conf = g_strdup_printf("slide %d",count);
59
59
 
60
 
                if (entry->original_filename)
61
 
                        g_key_file_set_string(img_key_file, conf,"filename", entry->original_filename);
62
 
                else if (entry->filename)
63
 
                        g_key_file_set_string(img_key_file, conf,"filename",    entry->filename);
 
60
                if( entry->o_filename)
 
61
                {
 
62
                        /* Save original filename and rotation */
 
63
                        g_key_file_set_string( img_key_file, conf,
 
64
                                                                   "filename", entry->o_filename);
 
65
                        g_key_file_set_integer( img_key_file, conf, "angle", entry->angle );
 
66
                }
64
67
                else
65
68
                {
66
69
                        /* We are dealing with an empty slide */
313
316
                gint anim_id,anim_duration, text_pos, placing, gradient;
314
317
                GdkPixbuf *pix = NULL;
315
318
                gboolean   load_ok;
 
319
                ImgAngle   angle = 0;
316
320
        
317
321
                /* Load project backgroud color */
318
322
                color = g_key_file_get_double_list( img_key_file, "slideshow settings",
337
341
 
338
342
                        if( slide_filename )
339
343
                        {
 
344
                                angle = (ImgAngle)g_key_file_get_integer( img_key_file, conf,
 
345
                                                                                                                  "angle", NULL );
340
346
                                load_ok = img_scale_image( slide_filename, img->video_ratio,
341
347
                                                                                   88, 0, img->distort_images,
342
348
                                                                                   img->background_color, &thumb, NULL );
392
398
                                                                                                         c_start, c_stop,
393
399
                                                                                                         p_start, p_stop );
394
400
 
 
401
                                        /* If image has been rotated, rotate it now too. */
 
402
                                        if( angle )
 
403
                                        {
 
404
                                                img_rotate_slide( slide_info, angle, NULL );
 
405
                                                g_object_unref( thumb );
 
406
                                                img_scale_image( slide_info->r_filename, img->video_ratio,
 
407
                                                                                 88, 0, img->distort_images,
 
408
                                                                                 img->background_color, &thumb, NULL );
 
409
                                        }
 
410
 
395
411
                                        gtk_list_store_append( img->thumbnail_model, &iter );
396
412
                                        gtk_list_store_set( img->thumbnail_model, &iter,
397
413
                                                                                0, thumb,
471
487
        g_key_file_free (img_key_file);
472
488
        img_set_total_slideshow_duration(img);
473
489
 
474
 
        time = img_convert_seconds_to_time(img->total_music_secs);
475
 
        gtk_label_set_text(GTK_LABEL(img->music_time_data), time);
476
 
        g_free(time);
477
 
 
478
490
        img_set_statusbar_message(img, 0);
479
491
 
480
492
        dummy = g_path_get_basename( input );
495
507
 
496
508
        /* Update incompatibilities display */
497
509
        img_update_inc_audio_display( img );
 
510
 
 
511
        time = img_convert_seconds_to_time(img->total_music_secs);
 
512
        gtk_label_set_text(GTK_LABEL(img->music_time_data), time);
 
513
        g_free(time);
498
514
}
499
515
 
500
516
static gboolean img_populate_hash_table( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GHashTable **table )