On 10 December 1908 he married Obdulia Garzón  and together they had five children. She was the dedicatee of the Danzas fantásticas, which he completed in 1919.
Along with de Falla, he returned to Madrid in 1914, working as a composer, teacher and critic. On 28 March 1916, he joined the Madrid Symphony Orchestra at the Hotel Ritz in that city, to perform the premiere of Falla's revised orchestral version of El amor brujo. In the early months of 1929, he visited Havana, Cuba, where he gave a series of seven lectures at the Hispanic-Cuban Institute of Culture.
His works include the operasMargot (1914) and Jardín de oriente (1923), the Danzas fantásticas (1919, versions for piano and orchestra), La oración del torero (written first for a lute quartet, then string quartet, then string orchestra), chamber music, piano works, guitar pieces and songs. Much of his work shows the influence of traditional Andalusian music. He also wrote a short one-movement Rapsodia Sinfonica (1931) for piano and orchestra. His music often conveys a feeling of rapture or exaltation. His guitar works include Fandanguillo and Hommage à Tárrega, which were written for Andrés Segovia. The dedicatee and/or first performer of a number of his piano works was José Cubiles.