A musician who both sings and composes, especially when recording or performing his/her own compositions.
A writer of songs.