iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add option to specify HTTP server listen address/interface.

Browse Source
This commit is contained in:
craig.p.drummond@gmail.com
2012-06-15 11:40:53 +00:00
parent 9c22bf8da2
commit 4b17e32a13
10 changed files with 120 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gui/httpserversettings.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>384</width>
<height>254</height>
<width>416</width>
<height>345</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -50,7 +50,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="BuddyLabel" name="label_3">
<property name="text">
<string>Port:</string>
@@ -60,7 +60,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QSpinBox" name="httpPort">
<property name="minimum">
<number>1</number>
@@ -70,6 +70,19 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="BuddyLabel" name="label_5">
<property name="text">
<string>Address/interface:</string>
</property>
<property name="buddy">
<cstring>httpAddress</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="LineEdit" name="httpAddress"/>
</item>
</layout>
</item>
<item>
@@ -91,7 +104,8 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>&lt;i&gt;&lt;b&gt;NOTE:&lt;/b&gt; MPD usually only plays songs that are stored within its folders. If you have connected via a local socket, then MPD can also play files located on your filesystem. If you are using a non local socket (e.g. you have entered a hostname or IP address in the &quot;Host&quot; field of the &quot;Server&quot; settings page), then Cantata contains a minimal HTTP server that can be used to server files to MPD. This, however, will only work whilst Cantata is running. If you enable &quot;Always use server&quot;, then Cantata will always pass server URLs to MPD for files, even when you have connected via a local socket.&lt;/i&gt;</string>
<string>&lt;b&gt;NOTE:&lt;/b&gt; MPD usually only plays songs that are stored within its folders. If you have connected via a local socket, then MPD can also play files located on your filesystem. If you are using a non local socket (e.g. you have entered a hostname or IP address in the &quot;Host&quot; field of the &quot;Server&quot; settings page), then Cantata contains a minimal HTTP server that can be used to server files to MPD. This, however, will only work whilst Cantata is running. If you enable &quot;Always use server&quot;, then Cantata will always pass server URLs to MPD for files, even when you have connected via a local socket.&lt;br/&gt;&lt;br/&gt;
&lt;b&gt;NOTE:&lt;/b&gt;&quot;Address/interface&quot; may contian either the IP address, or interface (e.g. eth0), that you wish to listen for connections on. Leave blank to use the local loopback address (127.0.0.1).&lt;/i&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -114,12 +128,23 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LineEdit</class>
<extends>QLineEdit</extends>
<header>lineedit.h</header>
</customwidget>
<customwidget>
<class>BuddyLabel</class>
<extends>QLabel</extends>
<header>buddylabel.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>enableHttp</tabstop>
<tabstop>alwaysUseHttp</tabstop>
<tabstop>httpAddress</tabstop>
<tabstop>httpPort</tabstop>
</tabstops>
<resources/>
<connections>
<connection>