A musician who both sings and composes, especially when recording or performing his/her own compositions.
A musician who composes songs; especially writing the song's lyrics and/or creating a melody or a tune for the song.