ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/DecentralizedMedia/Player.cpp
(Generate patch)

Comparing DecentralizedMedia/Player.cpp (file contents):
Revision 546 by douglas, 2005-07-03T22:13:07-07:00 vs.
Revision 549 by douglas, 2005-07-04T21:28:02-07:00

# Line 6 | Line 6
6  
7   #include <menes/standard.hh>
8  
9 < #include <menes-api/pcre/regex.hpp>
10 < #include <menes-api/posix/signals.hpp>
11 < #include <menes-ext/stack.hpp>
12 < #include <menes-hop/bind.hpp>
9 > #include <menes/api/pcre/regex.hpp>
10 > #include <menes/api/posix/signals.hpp>
11 > #include <menes/ext/stack.hpp>
12 > #include <menes/hop/bind.hpp>
13 >
14 > #include <signal.h>
15  
16   #include "Player.hpp"
17  
# Line 20 | Line 22 | inline void Sleep()
22          ::nanosleep(&sleep, NULL);
23   }
24  
25 < Player::Player(const _R<dbi::Connection>& connection, int player) : remote(player), player_(remote.IsRunning() ? NULL : new _H<api::Process>(_B("/usr/X11R6/bin/beep-media-player"))), position(remote.GetPlaylistPosition()), adder(hop::BindAll(&Player::Adder, this)), copier(hop::BindAll(&Player::Copier, this))
25 > Player::Player(const _R<dbi::Connection>& connection, int player) : state(STOPPED), remote(player), player_(remote.IsRunning() ? NULL : new _H<api::Process>(_B("/usr/X11R6/bin/beep-media-player"))), position(remote.GetPlaylistPosition()), adder(hop::BindAll(&Player::Adder, this)), copier(hop::BindAll(&Player::Copier, this))
26   {
27          api::Posix::SetSignalHandler(SIGUSR2, hop::BindAll(&Player::Change, this));
28  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines