Rename TrackerCategory to TrackerSearchContainer.
rygel-media-tracker.vala \
rygel-tracker-root-container.vala \
rygel-tracker-metadata-values.vala \
- rygel-tracker-category.vala \
+ rygel-tracker-search-container.vala \
rygel-tracker-video-category.vala \
rygel-tracker-music-category.vala \
rygel-tracker-image-category.vala \
Rygel.SimpleAsyncResult<MediaObject> {
protected string item_id;
- public TrackerGetMetadataResult (TrackerCategory category,
- AsyncReadyCallback callback,
- string item_id) {
- base (category, callback);
+ public TrackerGetMetadataResult (TrackerSearchContainer search_container,
+ AsyncReadyCallback callback,
+ string item_id) {
+ base (search_container, callback);
this.item_id = item_id;
}
return;
}
- TrackerCategory category = (TrackerCategory) this.source_object;
+ var search_container = (TrackerSearchContainer) this.source_object;
- string path = category.get_item_path (item_id);
- this.data = category.create_item (path, metadata);
+ string path = search_container.get_item_path (item_id);
+ this.data = search_container.create_item (path, metadata);
this.complete ();
}
/**
* Represents Tracker Image category.
*/
-public class Rygel.TrackerImageCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerImageCategory : Rygel.TrackerSearchContainer {
public TrackerImageCategory (string id,
MediaContainer parent,
string title) {
LAST_KEY
}
- public TrackerImageItem (string id,
- string path,
- TrackerCategory parent,
- string[] metadata) {
+ public TrackerImageItem (string id,
+ string path,
+ TrackerSearchContainer parent,
+ string[] metadata) {
base (id, path, parent, MediaItem.IMAGE_CLASS, metadata);
}
public abstract class Rygel.TrackerItem : Rygel.MediaItem {
protected string path;
- public TrackerItem (string id,
- string path,
- TrackerCategory parent,
- string upnp_class,
- string[] metadata) {
+ public TrackerItem (string id,
+ string path,
+ TrackerSearchContainer parent,
+ string upnp_class,
+ string[] metadata) {
base (id, parent, "", upnp_class);
this.path = path;
/**
* Represents Tracker Music category.
*/
-public class Rygel.TrackerMusicCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerMusicCategory : Rygel.TrackerSearchContainer {
public TrackerMusicCategory (string id,
MediaContainer parent,
string title) {
LAST_KEY
}
- public TrackerMusicItem (string id,
- string path,
- TrackerCategory parent,
- string[] metadata) {
+ public TrackerMusicItem (string id,
+ string path,
+ TrackerSearchContainer parent,
+ string[] metadata) {
base (id, path, parent, MediaItem.MUSIC_CLASS, metadata);
}
using Gee;
/**
- * Represents Tracker category.
+ * A container listing a Tracker search result.
*/
-public abstract class Rygel.TrackerCategory : Rygel.MediaContainer {
+public abstract class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
/* class-wide constants */
private const string TRACKER_SERVICE = "org.freedesktop.Tracker";
private const string TRACKER_PATH = "/org/freedesktop/Tracker";
Gee.List<AsyncResult> results;
- public TrackerCategory (string id,
- MediaContainer parent,
- string title,
- string service) {
+ public TrackerSearchContainer (string id,
+ MediaContainer parent,
+ string title,
+ string service) {
base (id, parent, title, 0);
this.service = service;
private void create_proxies () throws GLib.Error {
DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
- this.metadata = connection.get_object (TrackerCategory.TRACKER_SERVICE,
- TrackerCategory.METADATA_PATH,
- TrackerCategory.METADATA_IFACE);
- this.search = connection.get_object (TrackerCategory.TRACKER_SERVICE,
- TrackerCategory.SEARCH_PATH,
- TrackerCategory.SEARCH_IFACE);
- this.tracker = connection.get_object (TrackerCategory.TRACKER_SERVICE,
- TrackerCategory.TRACKER_PATH,
- TrackerCategory.TRACKER_IFACE);
+ this.metadata = connection.get_object (TRACKER_SERVICE,
+ METADATA_PATH,
+ METADATA_IFACE);
+ this.search = connection.get_object (TRACKER_SERVICE,
+ SEARCH_PATH,
+ SEARCH_IFACE);
+ this.tracker = connection.get_object (TRACKER_SERVICE,
+ TRACKER_PATH,
+ TRACKER_IFACE);
}
private string? get_item_parent_id (string item_id) {
*/
public class Rygel.TrackerSearchResult :
Rygel.SimpleAsyncResult<Gee.List<MediaObject>> {
- public TrackerSearchResult (TrackerCategory category,
- AsyncReadyCallback callback) {
- base (category, callback);
+ public TrackerSearchResult (TrackerSearchContainer search_container,
+ AsyncReadyCallback callback) {
+ base (search_container, callback);
this.data = new ArrayList<MediaObject> ();
}
return;
}
- TrackerCategory category = (TrackerCategory) this.source_object;
+ var search_container = (TrackerSearchContainer) this.source_object;
/* Iterate through all items */
for (uint i = 0; i < search_result.length; i++) {
string child_path = search_result[i][0];
string[] metadata = this.slice_strv_tail (search_result[i], 2);
- var item = category.create_item (child_path, metadata);
+ var item = search_container.create_item (child_path, metadata);
this.data.add (item);
}
/**
* Represents Tracker Video category.
*/
-public class Rygel.TrackerVideoCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerVideoCategory : Rygel.TrackerSearchContainer {
public TrackerVideoCategory (string id,
MediaContainer parent,
string title) {
LAST_KEY
}
- public TrackerVideoItem (string id,
- string path,
- TrackerCategory parent,
- string[] metadata) {
+ public TrackerVideoItem (string id,
+ string path,
+ TrackerSearchContainer parent,
+ string[] metadata) {
base (id, path, parent, MediaItem.VIDEO_CLASS, metadata);
}