Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
da041d3
Initial commit for Listening Rooms.
teo Sep 14, 2012
ca0975d
More work on listening rooms.
teo Oct 7, 2012
c79c2f6
Fix the listening rooms category not being expanded by default.
teo Oct 12, 2012
0d6d896
Fix broken rebase.
teo Nov 3, 2012
be86faa
Properly add rooms to sources model. Also fixes crash when adding more.
teo Oct 12, 2012
a31b251
Fix listening room item text.
teo Oct 13, 2012
4ec830d
First draft of a listening room widget.
teo Oct 13, 2012
4aeddfc
Added support for disbanding a listening room.
teo Oct 16, 2012
692b42b
Remove local copies of listening rooms when a source disappears.
teo Oct 18, 2012
8ba84d4
Implemented listening room renaming.
teo Oct 20, 2012
a0082bc
Make renaming a singleton dbcmd.
teo Oct 20, 2012
6f9ce31
Added support for title and description in ListeningRoomWidget
teo Oct 21, 2012
d4d5fc0
Added ListeningRoomHeader to ListeningRoomWidget, with placeholder text.
teo Oct 22, 2012
f930542
Added ListeningRoomModel.
teo Oct 23, 2012
30f242d
Added new icon for Listening Rooms.
teo Oct 23, 2012
45dba32
Initial work on ListeningRoomModel.
teo Oct 23, 2012
cb5dc8d
Implemented sharing ListeningRoom entries. LRs contain tracks now!
teo Oct 30, 2012
42d1408
Fixed move operations within a Listening Room.
teo Nov 6, 2012
3aecbd1
Keep implementations out of header files.
teo Nov 6, 2012
a83d1c0
Fixed room creation on drop.
teo Nov 7, 2012
62750d4
Implemented listeners list and previous tracks drawer.
teo Nov 8, 2012
f3d8084
Only allow one room per DJ.
teo Nov 8, 2012
308cedd
Show a default pixmap if there's no avatar.
teo Nov 8, 2012
4754b5a
Fix after rebase.
teo Nov 15, 2012
c843c3e
Don't show unnamed listeners string if there are none.
teo Nov 9, 2012
c33393d
Pretty sure the file is part of Tomahawk, not Tomabawk :)
teo Nov 11, 2012
a3e4215
Added support for showing listeners in a listening rooms.
teo Nov 11, 2012
db60777
Actually show the listeners list to the listeners too.
teo Nov 11, 2012
2d5cbc5
Added Join/Leave/Disband button to ListeningRoomWidget.
teo Nov 12, 2012
53a758f
Added cutoff filtering functionality to PlayableProxyModel.
teo Nov 13, 2012
64e209d
Created ListeningRoomCurrentTrackWidget.
teo Nov 15, 2012
495dac5
Make album cover rounded, and display the correct one.
teo Nov 16, 2012
edd9989
Fix some includes.
teo Nov 16, 2012
16f8933
Fixed listening room history drawer height.
teo Nov 17, 2012
5f12a86
Increase font size in current LR track widget.
teo Nov 17, 2012
daa22dd
Make the Listening Room's history view act like a history view.
teo Nov 17, 2012
6e0967e
More LR DJ semantics.
teo Nov 17, 2012
e568c3c
Fix reorder warnings.
teo Nov 18, 2012
aac18f5
Fixed ListeningRoomModel logic. DJ should now send correct LR data.
teo Nov 19, 2012
46fa016
Implement LR current row propagation.
teo Nov 20, 2012
91d55de
Removed debug spam and debug UI.
teo Nov 20, 2012
84a3916
Do not show expanded drop area for listening rooms.
teo Dec 13, 2012
f36a4fe
Merge branch 'master' into listeningrooms.
teo Oct 23, 2013
30f0b26
Remove Listening Room renaming. TODO differently.
teo Oct 23, 2013
e947231
Listening Rooms are now Parties
teo Oct 23, 2013
3f1208f
Fix icon name
teo Oct 23, 2013
2fbbd37
Fix Party postCommitHook
teo Oct 23, 2013
4cfdb52
Only allow one party per Source
teo Oct 24, 2013
1d7eef3
Removed ListeningRoomEntry in favor of reusing Playlist.
teo Oct 24, 2013
afd79f8
Unbreak playlist deletion.
teo Oct 26, 2013
3fee44a
Don't show a party's playlist in the playlists category.
teo Oct 26, 2013
7c09f88
Bring back the old listening rooms UI
teo Dec 5, 2013
e654f6b
Added sidebar and command widget to party layout.
teo Dec 9, 2013
0ab28a2
Unbreak Party Disband slot.
teo Dec 10, 2013
789aa87
Debug spam++
teo Dec 11, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added data/images/party.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,6 @@
<file>data/www/css/font-awesome.css</file>
<file>data/www/css/style.css</file>
<file>data/www/js/html5shim.js</file>
<file>data/images/party.png</file>
</qresource>
</RCC>
4 changes: 4 additions & 0 deletions src/libtomahawk/ActionCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ ActionCollection::initActions()
m_actionCollection[ "quit" ]->setShortcutContext( Qt::ApplicationShortcut );
m_actionCollection[ "quit" ]->setMenuRole( QAction::QuitRole );

// party actions
m_actionCollection[ "renameParty" ] = new QAction( tr( "&Rename Party" ), this );
m_actionCollection[ "disbandParty" ] = new QAction( tr( "&Disband Party" ), this );

// connect actions to AudioEngine
AudioEngine *ae = AudioEngine::instance();
connect( m_actionCollection[ "playPause" ], SIGNAL( triggered() ), ae, SLOT( playPause() ), Qt::UniqueConnection );
Expand Down
6 changes: 6 additions & 0 deletions src/libtomahawk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ set( libGuiSources
widgets/SearchWidget.cpp
widgets/SeekSlider.cpp
widgets/SourceTreePopupDialog.cpp
widgets/PartyWidget.cpp
widgets/PartyCommandWidget.cpp
widgets/PartyCurrentTrackWidget.cpp
widgets/StatsGauge.cpp
widgets/ToggleButton.cpp
widgets/WhatsHotWidget.cpp
Expand Down Expand Up @@ -198,6 +201,8 @@ list(APPEND libSources
AlbumPlaylistInterface.cpp
CountryUtils.cpp
FuncTimeout.cpp
Party.cpp
# PartyModel.cpp
Playlist.cpp
PlaylistEntry.cpp
PlaylistPlaylistInterface.cpp
Expand Down Expand Up @@ -291,6 +296,7 @@ list(APPEND libSources
database/DatabaseCommand_SetDynamicPlaylistRevision.cpp
database/DatabaseCommand_SetPlaylistRevision.cpp
database/DatabaseCommand_SetTrackAttributes.cpp
database/DatabaseCommand_PartyInfo.cpp
database/DatabaseCommand_ShareTrack.cpp
database/DatabaseCommand_SocialAction.cpp
database/DatabaseCommand_SourceOffline.cpp
Expand Down
18 changes: 17 additions & 1 deletion src/libtomahawk/LatchManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,24 @@
#include "Result.h"
#endif


using namespace Tomahawk;

LatchManager* LatchManager::s_instance = 0;


LatchManager*
LatchManager::instance()
{
if ( !s_instance )
{
s_instance = new LatchManager();
}

return s_instance;
}



LatchManager::LatchManager( QObject* parent )
: QObject( parent )
, m_state( NotLatched )
Expand All @@ -45,6 +60,7 @@ LatchManager::LatchManager( QObject* parent )
connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioPaused() ) );
}


LatchManager::~LatchManager()
{

Expand Down
6 changes: 5 additions & 1 deletion src/libtomahawk/LatchManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class DLLEXPORT LatchManager : public QObject
{
Q_OBJECT
public:
explicit LatchManager( QObject* parent = 0 );
static LatchManager* instance();
virtual ~LatchManager();

bool isLatched( const source_ptr& src );
Expand All @@ -51,6 +51,8 @@ private slots:
void audioPaused();

private:
explicit LatchManager( QObject* parent = 0 );

enum State {
NotLatched = 0,
Latching,
Expand All @@ -61,6 +63,8 @@ private slots:
source_ptr m_latchedOnTo;
source_ptr m_waitingForLatch;
playlistinterface_ptr m_latchedInterface;

static LatchManager* s_instance;
};

}
Expand Down
Loading