* updating message_factory to use new jam-pb naming

This commit is contained in:
Seth Call 2012-10-04 21:39:03 -05:00
parent 0f37d1523c
commit ee111930d2
1 changed files with 9 additions and 9 deletions

View File

@ -41,28 +41,28 @@ module JamRuby
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_ACK, :target => CLIENT_TARGET, :login_ack => login_ack)
end
# create a jam session login message
# create a music session login message
def login_music_session(music_session)
login_music_session = Jampb::LoginMusicSession.new(:music_session => music_session)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_MUSIC_SESSION, :target => SERVER_TARGET, :login_music_session => login_music_session)
end
# create a jam session login message ack (success or on failure)
# create a music session login message ack (success or on failure)
def login_music_session_ack(error, error_reason)
login_music_session_ack = Jampb::LoginMusicSessionAck.new(:error => error, :error_reason => error_reason)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_JAM_SESSION_ACK, :target => CLIENT_TARGET, :login_music_session_ack => login_music_session_ack)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_MUSIC_SESSION_ACK, :target => CLIENT_TARGET, :login_music_session_ack => login_music_session_ack)
end
# create a jam session 'leave session' message
# create a music session 'leave session' message
def leave_music_session(music_session)
leave_music_session = Jampb::LeaveMusicSession.new(:music_session => music_session)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LEAVE_JAM_SESSION, :target => SERVER_TARGET, :leave_music_session => leave_music_session)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LEAVE_MUSIC_SESSION, :target => SERVER_TARGET, :leave_music_session => leave_music_session)
end
# create a jam session leave message ack (success or on failure)
# create a music session leave message ack (success or on failure)
def leave_music_session_ack(error, error_reason)
leave_music_session_ack = Jampb::LeaveMusicSessionAck.new(:error => error, :error_reason => error_reason)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LEAVE_JAM_SESSION_ACK, :target => CLIENT_TARGET, :leave_music_session_ack => leave_music_session_ack)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LEAVE_MUSIC_SESSION_ACK, :target => CLIENT_TARGET, :leave_music_session_ack => leave_music_session_ack)
end
# create a server error
@ -80,7 +80,7 @@ module JamRuby
# create a user-joined session messag
def user_joined_music_session(user_id, username)
joined = Jampb::UserJoinedMusicSession.new(:user_id => user_id, :username => username)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::USER_JOINED_JAM_SESSION, :target => CLIENT_TARGET, :user_joined_music_session => joined)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::USER_JOINED_MUSIC_SESSION, :target => CLIENT_TARGET, :user_joined_music_session => joined)
end
# create a test message to send in session
@ -105,7 +105,7 @@ module JamRuby
return msg.target == MessageFactory::CLIENT_TARGET
end
# is this message directed to a (jam) session?
# is this message directed to a (music) session?
def session_directed? msg
return msg.target.start_with? MessageFactory::SESSION_TARGET_PREFIX
end