diff options
author | Thomas White <taw@bitwiz.org.uk> | 2013-01-29 00:03:11 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2013-01-29 00:03:11 +0100 |
commit | a1f6a1a06287421ddee2a1e68f88f52fd6e161dd (patch) | |
tree | fd9dd7e0d660a0370c94e62e41ff9f278afa4726 /src/mainwindow.c | |
parent | bb1735dcec49bb73ffb67af87cf5f7f8919af8b5 (diff) |
Plug slideshow back in
Diffstat (limited to 'src/mainwindow.c')
-rw-r--r-- | src/mainwindow.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c index 6f6a23a..0113d66 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -36,6 +36,7 @@ #include "mainwindow.h" #include "render.h" #include "frame.h" +#include "slideshow.h" static void rerender_slide(struct presentation *p, PangoContext *pc) @@ -54,13 +55,9 @@ static void rerender_slide(struct presentation *p, PangoContext *pc) s->rendered_edit = render_slide(s, w, h); /* Is this slide currently being displayed on the projector? */ - if ( s == s->parent->cur_proj_slide ) { - - w = s->parent->proj_slide_width; - h = (s->parent->slide_height/s->parent->slide_width) * w; - s->rendered_proj = render_slide(s, w, h); - - } + w = s->parent->proj_slide_width; + h = (s->parent->slide_height/s->parent->slide_width) * w; + s->rendered_proj = render_slide(s, w, h); } @@ -411,8 +408,7 @@ static gint about_sig(GtkWidget *widget, struct presentation *p) static gint start_slideshow_sig(GtkWidget *widget, struct presentation *p) { - /* FIXME */ - //try_start_slideshow(p); + try_start_slideshow(p); return FALSE; } @@ -433,7 +429,7 @@ void notify_slide_changed(struct presentation *p, struct slide *np) //} if ( (p->slideshow != NULL) && p->slideshow_linked ) { - //notify_slideshow_slide_changed(p, np); + notify_slideshow_slide_changed(p, np); } } |