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 554 by douglas, 2005-07-07T04:24:27-07:00 vs.
Revision 555 by douglas, 2005-07-10T21:18:35-07:00

# Line 22 | Line 22 | inline void Sleep()
22          ::nanosleep(&sleep, NULL);
23   }
24  
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))
25 > Player::Player(const _R<Connector>& connector, 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  
# Line 33 | Line 33 | Player::Player(const _R<dbi::Connection>
33          }
34  
35          _forall (int, position, 0, remote.GetPlaylistLength())
36 <                playlist.InsertLast(MediaFile(connection, remote.GetPlaylistFile(position)));
36 >                playlist.InsertLast(MediaFile(connector, remote.GetPlaylistFile(position)));
37  
38          if (remote.IsPlaying())
39                  state = PLAYING;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines