Convert to using POE for the event management.

diff --git a/lib/Display/Plugin.pm b/lib/Display/Plugin.pm
new file mode 100644 (file)
index 0000000..9df460e
--- /dev/null
+++ b/lib/Display/Plugin.pm
@@ -0,0 +1,20 @@
+package Display::Plugin;
+
+# Provide a base class that does common things for all the plugins.
+use Clutter;
+
+sub new {
+  my ($class,$kernel,$session,$stage) = @_;
+
+  my $self = {
+    'kernel' => $kernel,
+    'session' => $session,
+    'stage' => $stage,
+  };
+
+  bless ($self, $class);
+  $self->init();
+  return $self;
+}
+
+1;

diff --git a/lib/Display/Plugins/Clock.pm b/lib/Display/Plugins/Clock.pm
index 435d644272eec976397093e769bc558839871c93..5f19c55ba562c9c43cd81b070a3c2d9b90e21220 100644 (file)
--- a/lib/Display/Plugins/Clock.pm
+++ b/lib/Display/Plugins/Clock.pm
@@ -2,13 +2,13 @@ package Display::Plugins::Clock;
 
 use Clutter;
 use POSIX qw/strftime/;
 
 use Clutter;
 use POSIX qw/strftime/;

+use base ('Display::Plugin');

 
 sub new {
 
 sub new {

-  my ($class,$stage) = @_;
+  my $proto = shift;
+  my $class = ref($proto) || $proto;

 
 

-  my $self = {
-    'stage' => $stage,
-  };
+  my $self = $class->SUPER::new(@_);

 
   bless ($self, $class);
   $self->init();
 
   bless ($self, $class);
   $self->init();


@@ -21,13 +21,14 @@ sub display {
   $self->{'clock'}->set_text(strftime("%H:%M %d/%m/%Y", localtime(time)));
 
   Glib::Timeout->add_seconds(60 - strftime(%s, localtime()), $self->can('display'), $self);
   $self->{'clock'}->set_text(strftime("%H:%M %d/%m/%Y", localtime(time)));
 
   Glib::Timeout->add_seconds(60 - strftime(%s, localtime()), $self->can('display'), $self);

-
-  return 0;
+  $self->{'kernel'}->delay_set(clock_display, 60 - strftime(%s, localtime()));

 }
 
 sub init {
   my $self = shift;
 
 }
 
 sub init {
   my $self = shift;
 

+  $self->{'kernel'}->state('clock_display', $self, 'display');
+

   $self->{'clock'} = Clutter::Label->new('Sans 20', strftime("%H:%M %d/%m/%Y", localtime(time)));
   $self->{'clock'}->set_anchor_point($self->{'clock'}->get_width(), 1);
   $self->{'clock'}->set_position($self->{'stage'}->get_width() - 20, 15);
   $self->{'clock'} = Clutter::Label->new('Sans 20', strftime("%H:%M %d/%m/%Y", localtime(time)));
   $self->{'clock'}->set_anchor_point($self->{'clock'}->get_width(), 1);
   $self->{'clock'}->set_position($self->{'stage'}->get_width() - 20, 15);


@@ -43,7 +44,7 @@ sub init {
   $self->{'stage'}->add($self->{'bg'});
   $self->{'stage'}->add($self->{'clock'});
 
   $self->{'stage'}->add($self->{'bg'});
   $self->{'stage'}->add($self->{'clock'});
 

-  Glib::Timeout->add_seconds(60 - strftime(%s, localtime()), $self->can('display'), $self);
+  $self->{'kernel'}->delay_set(clock_display, 60 - strftime(%s, localtime()));

 }
 
 1;
 }
 
 1;

diff --git a/lib/Display/Plugins/FSpot.pm b/lib/Display/Plugins/FSpot.pm
index 50357e87a353f71e5d4878732c44e0c0207a9ac9..766a9d6d1b7409055a28534e3af10fdd1644dd60 100644 (file)
--- a/lib/Display/Plugins/FSpot.pm
+++ b/lib/Display/Plugins/FSpot.pm
@@ -1,17 +1,17 @@
 package Display::Plugins::FSpot;
 
 package Display::Plugins::FSpot;
 

-use DBI;

 use Clutter;
 use Clutter;

+use base ('Display::Plugin');

 
 my $f_spot_db = "/home/andrew/.gnome2/f-spot/photos.db";
 
 sub new {
 
 my $f_spot_db = "/home/andrew/.gnome2/f-spot/photos.db";
 
 sub new {

-  my ($class,$stage) = @_;
+  my $proto = shift;
+  my $class = ref($proto) || $proto;

 
 

-  my $self = {
-    'stage' => $stage,
-    'last_file' => '',
-  };
+  my $self = $class->SUPER::new(@_);
+
+  $self->{'last_file'} = '';

 
   bless ($self, $class);
   $self->init();
 
   bless ($self, $class);
   $self->init();


@@ -33,7 +33,7 @@ sub display {
     fade_in($self->{'new'});
 #  } else {
 #warn "Fade out old\n";
     fade_in($self->{'new'});
 #  } else {
 #warn "Fade out old\n";

-#    my $old_effect = Clutter::EffectTemplate->new_for_duration(1000, 'smoothstep_dec' );
+#    my $old_effect = Clutter::EffectTemplate->new_for_duration(1000, 'main::smoothstep_dec' );

 #    my $old = Clutter::Effect->fade($old_effect, $self->{'old'}, 0, $self->can('fade_in'), $self->{'new'});
 #    $old->start();
   }
 #    my $old = Clutter::Effect->fade($old_effect, $self->{'old'}, 0, $self->can('fade_in'), $self->{'new'});
 #    $old->start();
   }


@@ -43,13 +43,14 @@ sub display {
 #  $self->{'new'} = $temp;
   $self->{'last_file'} = $file;
 
 #  $self->{'new'} = $temp;
   $self->{'last_file'} = $file;
 

+  $self->{'kernel'}->delay_set(fspot_display => 30);

   return 1;
 }
 
 sub fade_in {
   my $new_pic = shift;
 
   return 1;
 }
 
 sub fade_in {
   my $new_pic = shift;
 

-  my $new_effect = Clutter::EffectTemplate->new_for_duration(1000, 'smoothstep_inc');
+  my $new_effect = Clutter::EffectTemplate->new_for_duration(1000, 'main::smoothstep_inc');

   my $new = Clutter::Effect->fade($new_effect, $new_pic, 255);
   $new->start();
 }
   my $new = Clutter::Effect->fade($new_effect, $new_pic, 255);
   $new->start();
 }


@@ -75,6 +76,8 @@ sub find_photo {
 sub init {
   my $self = shift;
 
 sub init {
   my $self = shift;
 

+  $self->{'kernel'}->state('fspot_display', $self, 'display');
+

   $self->{'dbh'} = DBI->connect("dbi:SQLite:dbname=$f_spot_db","","")
     || die "Failed to connect to $f_spot_db: $DBI::errstr\n";
 
   $self->{'dbh'} = DBI->connect("dbi:SQLite:dbname=$f_spot_db","","")
     || die "Failed to connect to $f_spot_db: $DBI::errstr\n";
 


@@ -105,7 +108,7 @@ LIMIT 1
     $self->{'stage'}->add($self->{$age});
   }
 
     $self->{'stage'}->add($self->{$age});
   }
 

-  Glib::Timeout->add_seconds(30, $self->can('display'), $self);
+  $self->{'kernel'}->delay_set(fspot_display => 30);

 }
 
 1;
 }
 
 1;

diff --git a/lib/Display/Plugins/MPD.pm b/lib/Display/Plugins/MPD.pm
index 4db3081ef6fcc2146e2bd8f1d311cbb1d8e387e4..6136ff35710f71aa6daf9b28dbc7ebb95cbea57b 100644 (file)
--- a/lib/Display/Plugins/MPD.pm
+++ b/lib/Display/Plugins/MPD.pm
@@ -3,16 +3,17 @@ package Display::Plugins::MPD;
 use Clutter;
 use Audio::MPD;
 use POSIX qw/strftime/;
 use Clutter;
 use Audio::MPD;
 use POSIX qw/strftime/;

+use base ('Display::Plugin');

 
 sub new {
 
 sub new {

-  my ($class,$stage) = @_;
-
-  my $self = {
-    'stage' => $stage,
-    'mpd' => Audio::MPD->new(),
-    'file' => '',
-    'active'=> 0,
-  };
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+
+  my $self = $class->SUPER::new(@_);
+
+  $self->{'mpd'} = Audio::MPD->new();
+  $self->{'file'} = '';
+  $self->{'active'} = 0;

 
   bless ($self, $class);
   $self->init();
 
   bless ($self, $class);
   $self->init();

diff --git a/picture.pl b/picture.pl
index aee5a09d107b95eaecaa0c639e1916044bc65a71..a51ba80295fd7bbf800e7275bca3b8fd2511fa9b 100755 (executable)
--- a/picture.pl
+++ b/picture.pl
@@ -4,6 +4,8 @@ use strict;
 use FindBin;
 use Module::Pluggable search_path => ['Display::Plugins'];
 use Clutter qw( :init );
 use FindBin;
 use Module::Pluggable search_path => ['Display::Plugins'];
 use Clutter qw( :init );

+use Glib;
+use POE qw(Loop::Glib);

 use Getopt::Long;
 
 use lib "$FindBin::Bin/lib";
 use Getopt::Long;
 
 use lib "$FindBin::Bin/lib";


@@ -14,39 +16,47 @@ GetOptions(
   'full|f!' => \$full_screen,
 );
 
   'full|f!' => \$full_screen,
 );
 

-my $stage = Clutter::Stage->get_default();
-$stage->set_color(Clutter::Color->parse('Black'));
-$stage->signal_connect('key-press-event' => sub { Clutter->main_quit() });
+my $session = POE::Session->create (
+  inline_states => {
+    _start =>  \&start,
+  },
+);

 
 

-if ($full_screen) {
-  $stage->fullscreen;
-} else {
-  $stage->set_size(800, 600);
-}
+$poe_kernel->run;

 
 

-my @modules = loadModules();
+#Clutter->main();

 
 

-$stage->show_all();
+sub start {
+  my ( $kernel, $session ) = @_[ KERNEL, SESSION ];

 
 

-Clutter->main();
+  my $stage = Clutter::Stage->get_default();
+  $stage->set_color(Clutter::Color->parse('Black'));
+  $stage->signal_connect('key-press-event' => sub { Clutter->main_quit() });

 
 

-sub update_screen {
-  for my $module (@modules) {
-    $module->display();
+  if ($full_screen) {
+    $stage->fullscreen;
+  } else {
+    $stage->set_size(800, 600);

   }
   }

+
+  my @modules = loadModules($kernel, $session, $stage);
+
+  $stage->show_all();

 }
 
 }
 

+

 sub loadModules {
 sub loadModules {

+  my ($kernel, $session, $stage) = @_;

   my @modules;
 
   for my $module (plugins()) {
   warn "Considering $module\n";
     eval "use $module";
     if ($@) {
   my @modules;
 
   for my $module (plugins()) {
   warn "Considering $module\n";
     eval "use $module";
     if ($@) {

-      die "Failed to load plugin: $module ($@)\n";
+      warn "Failed to load plugin: $module ($@)\n";
+    } else {
+      push @modules, $module->new($kernel, $session, $stage);

     }
     }

-
-    push @modules, $module->new($stage);

   }
 
   return @modules;
   }
 
   return @modules;